Merge "Moving skip_mount.cfg to system_ext partition" am: 95773aa4b6
am: 038c884bd0

Change-Id: Ic7af1187919c52dadfe662463d4a414f0d75b3b2