Merge \\\"More kernel header updates.\\\" am: 5806006ffa am: afdc10881b
am: a500602aa0

Change-Id: Ia37b0f9a2bab28895ff4e88e084a38d697461643