Clean up ownership in frameworks/av/ am: fd124e4e55 am: 547282798c

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

Change-Id: Id9055508b55837a1714e79a29b052e4a64d58fdd