Merge "Convert doclava to Soong for Droiddoc" am: a54d47755b am: d0b671a4fd
am: 9ffd4ee933

Change-Id: I91cd60b756214b59e3306f6e6003c9b5cd5cd6cf