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

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



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