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

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



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