Fix temporary change for new kernel headers.
am: a654b4a7fc

Change-Id: Ia6d9b06a74319399f2f50d096758c733475e51ce