Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-dev