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

Change-Id: I0bd35d2f2e2251e4f17eab701c01c7745eb7b6e8