Revert "Fix the build: Revert "Merge commit '2fa58563c9052ab3df28a13406fde6d7a5fe74e4' into sl4a""

This reverts commit b3b58f5d321a49dee550cab157ae993276a8be86.

Conflicts:
	Tools/atest/atest/tests/test_all.py
	Tools/sl4a/Common/Android.mk
	Tools/sl4a/Common/src/com/googlecode/android_scripting/facade/ScanFacade.java
	Tools/sl4a/Common/src/com/googlecode/android_scripting/facade/WifiPasspointFacade.java
	Tools/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
	Tools/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
	Tools/sl4a/QuickAction/Android.mk
	Tools/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerService.java
	Tools/sl4a/Utils/Android.mk
	Tools/sl4a/Utils/src/com/googlecode/android_scripting/SimpleServer.java
	Tools/sl4a/build_all.sh
	testcases-comms/testcases/android/common.py

Change-Id: I5cb0ba7032805366dcbb763a72efaba2e8d68440
372 files changed