Merge "AAPT2: Add option to add JavaDoc annotations to Java classes" into nyc-dev
am: b12c260

* commit 'b12c2601f475ee127d9ab333e5b8c6cd9a9967e4':
  AAPT2: Add option to add JavaDoc annotations to Java classes

Change-Id: I67b797ff2bdc05ef318796841b545812179a617c