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

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



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