am cb7c47d0: am d012d06b: Fix the ordering of lock acquisition in the heap worker.

Merge commit 'cb7c47d047f80952a69f1d2a7200c589754b4870' into dalvik-dev

* commit 'cb7c47d047f80952a69f1d2a7200c589754b4870':
  Fix the ordering of lock acquisition in the heap worker.