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

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