Merge "Make dir work on multiple paths" am: cd2eca27 am: 626335b7 am:...

Merge "Make dir work on multiple paths" am: cd2eca27 am: 626335b7 am: 59b9e47e am: 29131c2f am: 1ff5190c

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



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