Merge "Remove SkipMountingPartitions from vendor libfstab"