Merge "aconfig: update cpp codegen to use static methods" am: f1cd83be am:...

Merge "aconfig: update cpp codegen to use static methods" am: f1cd83be am: d57d4fed am: c9156e60

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



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