Merge "Update droiddoc with combined generation of Java and Kotlin docs" am: ca31913b am: fccf7d89 am: 24838df3 Change-Id: Ia3efd00d211b16e35aeca633e9519096a908fba2