Merge "[RESTRICT AUTOMERGE] Fix bug: include all dirs not just the last one." into android11-tests-dev