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

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

Change-Id: I87898703dd74204846a90db09d9c2b2c74d6aee7