Merge "Update aapt/aidl/zipalign to AAZ14  #1851890 in master-release"