Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"