Merge "AAPT2: Fix inclusion of comments in R.java javadoc"