Merge "Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab()" am: 74d84224ae
am: 1fcf721cda

Change-Id: I87648554774b57ca86b8fa29ebb1c3034023b2fb