Merge "wifi: put vintf fragment into wifi apex"