Merge "Turn off dbg messages, be prepared for production build" into jb-mr1-dev

diff --cc src/com/android/bluetooth/a2dp/A2dpService.java
Simple merge

diff --cc src/com/android/bluetooth/btservice/AdapterService.java
Simple merge

diff --cc src/com/android/bluetooth/hdp/HealthService.java
Simple merge

diff --cc src/com/android/bluetooth/hfp/HeadsetService.java
Simple merge

diff --cc src/com/android/bluetooth/hid/HidService.java
Simple merge

diff --cc src/com/android/bluetooth/pan/PanService.java
Simple merge

diff --cc src/com/android/bluetooth/pbap/BluetoothPbapService.java
Simple merge