Merge "AAPT2: Move to proto3"