Merge "Drop Google's version of bcm4329 and bcmdhd"