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

Change-Id: Idba05cd82a92ac688cc7686dcf3c0a68cb64a29c