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

Change-Id: I298d9829a955461da449db156ed06313d54e21e2