Merge "Change ownership of AAPT2 and libandroidfw"