Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master