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

Change-Id: If15e32c3edaa52e8cccb1a46e230c7ae0cdc39fe