Merge in Bluetooth from ville and comanche; other minor fixes

Change-Id: I787690dc59a5f1d46220c60574105479222ca005
remove prima symlink

Change-Id: I01573d44f40380edfbc25bfb8f43168a1a227890