Merge "fs_config: wifi is now on vendor partition"
am: 11d3d4d22a

Change-Id: Iaaff4b41d7ac72f68717d5ee5f6bf15861439d0a