Merge "Remove duplicate entries with libcore expectation files."