Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I4663c3fd5eb5bf03bb1f421ffe39cd761c1b30ca

diff --cc packaging/webapi-plugins.spec
index 79244b4,1202f5d..a28cbc5
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -6,11 -6,9 +6,11 @@@
  %define crosswalk_extensions tizen-extensions-crosswalk
  
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 +%define tizen_ut_build 0
 +
  
  Name:       webapi-plugins
- Version:    2.69
 -Version:    2.53
++Version:    2.70
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/bluetooth/bluetooth_api.js
index 905fa1c,4f3a7c1..212beb8
--- 1/src/bluetooth/bluetooth_api.js
--- 2/src/bluetooth/bluetooth_api.js
+++ b/src/bluetooth/bluetooth_api.js
@@@ -1528,9 -1514,7 +1528,7 @@@ BluetoothLEAdapter.prototype.startScan 
  BluetoothLEAdapter.prototype.stopScan = function() {
      privUtils_.log('Entered BluetoothLEAdapter.stopScan()');
  
-     _bleScanListener.removeListener();
- 
 -    var result = native.callSync('BluetoothLEAdapter_stopScan', {});
 +    var result = native.callSync('BluetoothLEAdapterStopScan', {});
      if (native.isFailure(result)) {
          throw native.getErrorObject(result);
      }