Merge "mockingservicestest: add jni dependency" into sc-dev