Merge change I9490271c into eclair

* changes:
  Add BluetoothDevice to SDK AIDL list.