Merge "Add bugfix flag for tools reading from the new storage" into main am: 34c2b860

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



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