Merge "AAPT2: Cleanup proto classes/methods and add XML serialization"