am 22f1e3d4: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.

Merge commit '22f1e3d4fae7d45cc439da94690d786ed44756fb' into gingerbread-plus-aosp

* commit '22f1e3d4fae7d45cc439da94690d786ed44756fb':
  Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.