Remove MergeCollation and PatternEntry from EXPECTED_UPSTREAM

https://r.android.com/2646363 has remove the files

Test: n/a
Change-Id: Ifd7e7e1afa1022a7df9e0850502e4060b7716f76
1 file changed
tree: 2db1fae9fe46ab8a3c420c694d7ad6a2a9b7b976
  1. ojluni/
  2. tools/
  3. EXPECTED_UPSTREAM