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