Merge "Update acov script to handle new coverage file locations." am: 834c8442cb am: 0b6aee253a

Change-Id: I308605b471bbcaa347acad3e9cbb607f525621c7