Merge "Update api to reflect changes in doclava" am: 39ff2ceae7 am: 5dfb125389
am: 57b3b6ad0a  -s ours

Change-Id: Ie16f1f6a689a59c51f2b69e998855a107138f009