Merge "Change aapt2 to specify full protos"