(cherry picked from commit aa00b5a0ab)
Conflicts:
platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
(cherry picked from commit aa00b5a0ab)
Conflicts:
platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp