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

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

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



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