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

Change-Id: I730e04651fce8267176b577622bfe0b821ebd8c9