Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494
am: 351f69e64a

Change-Id: I83220c87347e6f4fe76b73924347b55a9c9e18ff