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

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

Change-Id: I241219bab1f4d8022da7427a53c436c1b947b71c