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

Change-Id: I54cd99ed4ae93166164aea0069b09da1830109c1