am 1fc09408: am a15bd8a9: Merge "Fix build." into jb-mr1-dev
am 1fc09408: am a15bd8a9: Merge "Fix build." into jb-mr1-dev

* commit '1fc0940856f432f5847bfa00e06e8d989d2cb056':
  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