Merge "Add rules for vfat for sdcardfs" am: b9bba83abc
am: f26d79c561

Change-Id: I0c1a79082955faeebe8cf70bb408928479117aad