Merge "Dump debug information for apply_patch unit tests"
am: fe527cced4

Change-Id: Ife392c1a6a99e8ae0b8d4a46330596f5c742f099