DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base