GitLab

The tests currently assume that the normal and CJK fonts have different metrics.
On Android, this is not true for all platforms we support.  The tests still have
some value when run with fonts with identical metrics, so modify the test
expectations slightly to work in that case and enable these tests.

Bug: 865540
Change-Id: I6cd98a254f9ae0e6c6a9818e37c9ae69ca954f13
Reviewed-on: https://chromium-review.googlesource.com/c/1343531
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610115}