Merge "Remove libbluetooth-types-header from libhardware"