[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s ours am: 6e5deb6344 -s ours am: 6b9ac796fe -s ours

am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history

Change-Id: I49927549ee57ff0a1df0fba06aa792b7a5bff8e7