Merge "AssembleVintf fix error message for conflicting manifest levels."