Add BT & HWC patches