Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev