[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into...

[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e -s ours am: bcb60390 -s ours am: 90775482 -s ours am: e3d5b84a -s ours

am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 39c94c04 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539145

Change-Id: I8394ef8925fef24d1fd630655aae6cb4a10e34e4