Merge "installd: Simplify Dalvik cache path creation"