Merge "aconfig: use proto struct directly" am: 23788f85 am: 7639e644 am: 6a5ce4a2

Original change: https://android-review.googlesource.com/c/platform/build/+/2628052



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