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

* commit 'fe1d3b12de3b9dad5fa1b84115602bd6e9f32767':
  fix PDK build