Merge "Revert "Have /storage always point to sdcardfs by default.""
am: bc58945cd1

Change-Id: I2fef30b72fecb51363b5d8be2bb73bbe73a7a152