Merge "AAPT2: Add support for comments in R.java"