am 43a903c7: am 053644db: Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev

* commit '43a903c763916dccdd4052037cf64774eeb7582a':
  add api level 17 to javadoc filter and update version number