Merge "Fix bug: include all dirs not just the last one." into oreo-cts-dev