[automerger skipped] Fix bug: include all dirs not just the last one. am: 647bfb35 am: 33c9a9ca -s ours

am skip reason: skip tag Change-Id I5724f792ee36c2f66786761e5d55b4f6c456753c with SHA-1 5371607b is already in history

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

Change-Id: I00ab8574f699e1a215307f5027dba6c7ac7d5860