am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."

* commit '4f92abad95f724c0bf29c93d6b1c8fff41049007':
  Two quick fixes: fix kernel header location and nostdlib.

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