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

* commit '69e211844100e760646170c444f44f1064a48a77':
  Clean up some dead dalvik cruft.