Merge "enable java/jni build in PDK if supported" into jb-mr1-dev