am f93c6fe6: Merge "Fixed layout for dex caches in boot image."

* commit 'f93c6fe65c4c5e601cce467e87bbe71a87c5bac0':
  Fixed layout for dex caches in boot image.