Temp fix to allow new kernel headers to merge.
am: 1ab187732d

Change-Id: I7362675947e5c5f29ed9bdfab1c8c13ad38476ed