Merge the 2018-05-05 SPL branch from AOSP-Partner

* refs/heads/security-aosp-nyc-mr2-release:
  Drop codepoints that are outside the Unicode range - DO NOT MERGE
  Reject unsorted cmap entries. DO NOT MERGE

Change-Id: I19dd6842d19d4dbbe4ec737a8542bed2683ff903