am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."
am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."

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