am 940eb097: am d5111f25: Merge "Fix the build." into jb-mr1-dev
am 940eb097: am d5111f25: Merge "Fix the build." into jb-mr1-dev

* commit '940eb097278ae70c721a347dc5eee8e34fdbf191':
  Fix the 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