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: 1d38e861 am: 29d6f881

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



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