Merge "Fix PDK build"
am: 24e34e4b8e

Change-Id: I559cb5436686fd9214dcabf7509fc8b176938c61