Merge "Make sdcardfs the default"