Merge "installd: Simplify Dalvik cache path creation" am: ad95fc06aa
am: c3ca770d0a

Change-Id: Ia76cf16f9a79be5f59bc034920a7206871a81e0e