am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev

* commit 'daceb30bf5e54aeb73a3909a26f51322d3f8efdc':
  Cancel handler for JS unload handler prevents hang.

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