Merge "Add rtmitchell to AAPT2 OWNERS"