Revert "Add context for CM's alternate dalvik-cache path"

This reverts commit 995537ab651483d3a036c5baf8e32c69c7836255.
Merge remote-tracking branch 'upstream/jb3' into local_jb3