Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev