Merge "aconfig: update cpp_codegen to just read from new storage" into main...

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

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



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