Fix cleanup race condition where objects might may not be cleaned up correctly.
Fix cleanup race condition where objects might may not
be cleaned up correctly.

Change-Id: Ia48e06c3d050b6b39b39f8fdc9f0eb89b92fe1bf

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