Merge "Dist aapt2 protos"
am: b602193169

Change-Id: I07d5c0307cf8faa03f0869e78b3a548f171ad6b0