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

Change-Id: Ib845c0ad109545d97c3a6b24e5c73398a900af93