Merge "statsd: mark libstats_jni as jni_libs" into rvc-dev-plus-aosp