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

Change-Id: I06e799716383cc676db358b58a823f9692745981