Merge changes from topic "refactor_mix" am: e02cc395 am: 1ae606f1 am: ec944134

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



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