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

* commit '9f928944fa4186e97b051b0076d7e30469b92124':
  update droiddoc option to include api level 21 for javadoc tagging