Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 am: 4ad9995b5b
am: f9289591f5

Change-Id: Ib1ecfb99dcffde5570fa9cb32feafc43827da208