Merge "Teach mgrep to find soong/*.go files." am: 46d9bf8f9a
am: bb67e3ae54

Change-Id: I5dd2d2bdafc4b003da4f603fa483402d13e73869