Merge "More media mainline module code separation" am: 8e13c81a am:...

Merge "More media mainline module code separation" am: 8e13c81a am: 7bb7cb19 am: 5561d065 am: 38a9d831 am: 17935a33

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



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