Merge "Set jni_uses_platform_apis for CtsOsTestCases and CtsThermalTestCases" into rvc-dev