(cherry picked from commit aa00b5a0)

Conflicts:

	platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp