Merge "Track libnativehelper move for PDK." into jb-dev