Merge "Migrate more mainline-hosted code into module directory" am: ec5965ba...

Merge "Migrate more mainline-hosted code into module directory" am: ec5965ba am: e7bbb168 am: a1900087 am: 6c5122e8 am: 2df9bf79

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



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