Merge "deleted android_bluetooth_ScoSocket.cpp from makefile"