am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-dev
am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-dev

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