Merge "Sdcardfs is now the default. Remove unnecessary line"