Merge "AAPT2: statically link protobuf library" into nyc-dev