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

Change-Id: I6a95f04ce99e8e53b749f7873ddf056e3d9dff3f