Merge "Disable Homogeneous space for dex2oat"
am: 48dfaba75f

* commit '48dfaba75f564c58af1d29b676a5fe1b52a536dd':
  Disable Homogeneous space for dex2oat