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

Change-Id: Idbce143d1d97c99cbf24dc1f05963cd589850262