Merge "msm: ipa4: add IOCTL for bridge to vlan mapping"