Merge "Do not unmount /mnt/product/* when vold starts"