Merge "Fix warning about recursive loading of libmedia_jni.so" into sc-dev am: a6d52d2e9a am: 7a039026f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640158 Change-Id: I552856fb5ee6dfde660b2a63ec2de293250c5d8d
This commit is contained in: