am ad1a8377: Merge "More dalvik-cache cleaning fixes."

* commit 'ad1a8377a2cf97c9043c6158e4d080105f5e0d61':
  More dalvik-cache cleaning fixes.