am 6d954bbd: Merge "Fix build breakage"
am 6d954bbd: Merge "Fix build breakage"

* commit '6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56':
  Fix build breakage

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