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

Change-Id: I0a4885c45fa9ddcc88c7cab6439ba5ba2fcfb4b3