Merge "Fixed layout for dex caches in boot image."