am 0bc4145c: am 69e21184: Merge "Clean up some dead dalvik cruft."

* commit '0bc4145cf1ef206c3ede4d212f9b510421bf7544':
  Clean up some dead dalvik cruft.