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

Change-Id: Iee7dcf982f266e924335c0f6c5000753a6f1fc24