Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev