Merge "assemble_vintf conflict of hal names for multiple manifest fragments"