Merge "Add a test for mixed /*@noflip*/ and /*@embed*/ CSS annotations"