Fix temporary change for new kernel headers. am: a654b4a7fc
am: 80234daf96

Change-Id: I4e9a45f1654cf8bf4221563865c3403424d744d0