Merge "Add lint-baseline.txt" am: bd050a696b

Change-Id: I97fb4a9e27dd0fd49e6d334608c94cca8b1a33f0