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

Merge commit '0a4a393d717a2289c9fa2036f502f97c74d56e35'

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