am 62526137: am fe1d3b12: Merge "fix PDK build" into jb-mr1-dev

* commit '62526137891e38aceb8562459a85eef1a73c3856':
  fix PDK build