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

Change-Id: Idc6d818aee78832c086e58e213f1b1c91e3a0075