update headers to match kernel

Change-Id: I8f590d3e33da6d1d11bf84497b67ef2599688f3e