Merge "Update droiddoc with combined generation of Java and Kotlin docs"
am: ca31913b92

Change-Id: I1b701c9165800a22179b6a0d3cb161c27c908687