Merge "Clean up use of GetDalvikCache."
am: 882c0e4899

Change-Id: Ifac13144494305120408b7981f8fbe7a5ada9314