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

Change-Id: Icbae2a8fe2c268b33492df0f0522d44a04c48afa