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

Change-Id: I8ac1fbf28226366e7254bee639a99129f795eb3c