am b114402f: Merge "Fix SDK build."
am b114402f: Merge "Fix SDK build."

* commit 'b114402f8279b1215d4f8572cb94ed063b240624':
  Fix SDK 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