Merge "enable PDK to use platform JAVA API" into jb-dev