Merge "Use build_id as parent directory when building cache." am: 50f019dc95

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2608629

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