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

Change-Id: I34a71d1a294bad5dd110be63a9d5a0cf746c8491