am 166ed46d: Cherry picking changes from dalvik-dev

Merge commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3' into gingerbread-plus-aosp

* commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3':
  Cherry picking changes from dalvik-dev