Merge "aconfig: update cpp_codegen to just read from new storage" into main am: 5b6b40e0

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



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