am ff3cc1d1: Merge "Fix the ordering of lock acquisition in the heap worker."

Merge commit 'ff3cc1d1dfb03da6065879d26089d6f2ca129dcc' into dalvik-dev

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