Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553 am: 40bfff9159
am: 58cbc132c0

Change-Id: Ibc0c1a06729715d40d35b1e4270e748cad0e8acc