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

Change-Id: Ib29a5fe5b33ebb3eedc4f15c7277becd2a350500