Merge "AAPT2: Clean up R JavaDoc generation" into nyc-dev
am: d3caf46

* commit 'd3caf46a850fb3191562fc5e05c2aa8b5912b598':
  AAPT2: Clean up R JavaDoc generation

Change-Id: I4e83f950621c8be80600c3dc11a0cd9081477549