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