Merge "applypatch: Move to Soong." am: b058c5c481
am: 7722d8255c

Change-Id: Ie98b90295ccf607c8e5b71401dce190fdfa05ce0