Merge "hw/bluetooth.default.so -> libbluetooth.so (2/2)"
am: c2ab3af3ca

Change-Id: Iafcb8dcd939a936c991f6ee7654b2ff06ccf0429