Merge "DrmManager: choose plugin load path based on arch" into tm-dev am:...

Merge "DrmManager: choose plugin load path based on arch" into tm-dev am: 768f4c48 am: 63d7e554 am: ae79e38a am: e46d7f5d

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



Change-Id: Iaaf2dac3965d7625f676e2141ca4f409a2ba6d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>