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

Change-Id: Ie552b200889dd1af330969c9166249f3cad6fd91