Merge "Save the target file when applypatch tests fail" am: 957c1abfba am: 7ad3e673ba
am: 52635f5259

Change-Id: I5e22c99622aa30a9764837543beaa80ee03de017