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

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