am 15fccd19: am 3e87eafc: Merge "Fix the build." into jb-mr1-dev
am 15fccd19: am 3e87eafc: Merge "Fix the build." into jb-mr1-dev

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