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