Making javadoc actually get flagged as javadoc

Change-Id: Ieb25fbaec9ee4eecc0b24c80acf92d1dc45888e0
Signed-off-by: Colin Dixon <colin@colindixon.com>
Merge "Making javadoc actually get flagged as javadoc"