Merge "Dist aapt2 protos"