Merge "more mainline-related code to module-specific directories" am: 833fbd7e

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



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