Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev