Merge "Convert dx droiddoc module to Soong." am: 25124d0f46
am: 1df84d1eb0

Change-Id: I9f808cbefd70e37e70eb6eef20696e2500bbde7c