Merge "AAPT2: Clean up R JavaDoc generation" into nyc-dev