Merge "AAPT2: Update --no-version-vector list" into oc-dev am: f296105e22
am: ad227a8086

Change-Id: Ie60160136d6bbca607ce98cd675ffed984b2debc