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

Change-Id: Ic99a44e0d137f7c26106ff45776500a75b6827d9