DO NOT MERGE fix build breakage on k
DO NOT MERGE fix build breakage on k

Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889

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