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

Change-Id: I299c3ee133280d7996574791fb150a1bab7ad8e2