Merge "Change OWNERS." am: 9cca2b9fde am: 0ab4e884da

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/2159239

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