Merge "aapt2: Fix deprecated proto API usage."