Revert "shinano: use bt blob for now"

This reverts commit 25410f40f0f6497f0683a0030d693ab0dbe9c1bc.

Conflicts:
	shinano-common/proprietary/lib/libbt-hci.so

Change-Id: I8faf9923617843c83995b1d93c62b770d8bde30f
shinano: Add NCI HAL module name to libnfc-brcm.conf

TODO: Move this to device

Change-Id: I4545676bcf15715ab29302436b7e1bdb88da4217
Merge pull request #20 from TheMuppets/cm-12.0

update