Merge "Revert "Revert "sdcard: Support sdcardfs""" into nyc-dev