Merge "Give users and devices control over sdcardfs." into nyc-dev