Merge "AAPT2: Fix typo in BinaryPrimitives oneofs"