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

Change-Id: I5c4f1b9ea57bea13b97016da98830c87a767ec53