Merge "Dist aapt2 protos" am: b602193169 am: 0783f2d300
am: 0fc50310f3

Change-Id: Ifd9668f3931ec4d276b79a6e5ece576860271de7