Merge "Define coverage paths using comma-separated list."
am: 8a4b4e8432

Change-Id: Icfd1a342714662742ef72cabcd746109f173f97c