am 0f50cb31: Merge "Fix build."
am 0f50cb31: Merge "Fix build."

* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b':
  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