am 6495ef97: Merge "Fix build." into mnc-dev
am 6495ef97: Merge "Fix build." into mnc-dev

* commit '6495ef975f330d07370da46f69a7e808b3177467':
  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