[automerger skipped] Merge "Add support for --replace-version to aapt2" am: 186be90eb6 am: 5c0601d65a  -s ours
am: a0a864e571  -s ours

Change-Id: Idab3c2644f91a6e42b6e25a75b1cdaf4cb152f37