am 2df124b8: Merge "Fix build" into mnc-dev
am 2df124b8: Merge "Fix build" into mnc-dev

* commit '2df124b8547c4ba7a2b0c9903f21811583f74184':
  Fix build

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