Merge "Fix pitfall: do not delete intermediates dir." am: 5c6b4e02 am:...

Merge "Fix pitfall: do not delete intermediates dir." am: 5c6b4e02 am: 93eeaf4f am: e4af9a8c am: d35a1ca8 am: 60f3ef5f

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



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