Merge "Have /storage always point to sdcardfs by default." am: a587d69364 am: 74b049c172 am: 9e767e74c1

Change-Id: Idaa68b59aad030203e06c26437f430effa6d4881