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

Change-Id: I8753f4988de970344849069e18ea649d25f20350