am 0fd34bb2: Merge "Use instruction specific dalvik cache dirs."

* commit '0fd34bb2a3b927aa323c48cbe6d97fb427966aaf':
  Use instruction specific dalvik cache dirs.