Merge "Add lint-baseline.txt files for test base/runner/mock" am: b80e0dac87 am: 0021e9f2fd

Change-Id: Id85b9963240d05b70828f846cba45009eb765f6b