Merge "Update api to reflect changes in doclava"
am: 39ff2ceae7

Change-Id: Idb0c057c201976967ff46ba1362301a522a2bc23