Merge "Update acov script to handle new coverage file locations."