Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf am: 3d4fb41f3d
am: 1c1186618b

Change-Id: Id7c6821ea7551cfd42b4f07427d71f14a979c2aa