Merge "AAPT2: Emit proper doclava comments in R.java" into nyc-dev