am 2ac57b50: am 45f975bb: Merge "Fix PDK build."
am 2ac57b50: am 45f975bb: Merge "Fix PDK build."

* commit '2ac57b50da24fdce2e60445a4ce66e34f01cae32':
  Fix PDK build.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build