am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread

* commit 'ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.