Merge changes Ide8fc07c,Ia1f51db4

* changes:
  Allow vold to mount on top of /data/media.
  Revert "Temporarily relax Zygote storage mounting rules."