am d57f7dc4: am b3571a6c: Merge "Fix build" into jb-mr1-dev
am d57f7dc4: am b3571a6c: Merge "Fix build" into jb-mr1-dev

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