Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev am: 330c57dbd1
am: 979aa9e6df

* commit '979aa9e6dfc0530593e5eeb285ef19a4f5cab7ad':
  AAPT2: Add descriptions of Attributes in Styleables for R.java