Merge "Fix PDK build"
am: 6fb05cb71a

Change-Id: Ia463bd5465fcf0eb1487525a39a4fa4f1d0e0659