Merge "Remove intermediate src dir" am: 5491c611c0 am: c071011399

Original change: https://android-review.googlesource.com/c/platform/tools/loganalysis/+/1663183

Change-Id: I5e0bc652cef93bbce8d3350f809a9448e06bb16f