Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659e am: 20d9c8ea5a
am: bda3d90ae5

Change-Id: I772ec448ea4d14efac2b783eea95e598d41eadc1