am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '3c88a685021a5acd099dc7625a11e8d98f0e8fbe':
  DO NOT MERGE: Fix build after checkThread fix merge to master

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base