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

Change-Id: I29115639e8c95474746e6dae64757373c9731d26