Merge "Reject unsorted cmap entries. DO NOT MERGE am: 891e1569fa  -s ours" into lmp-mr1-dev am: abc4ac75da am: 33f42da9a9  -s ours am: a02dccd656 am: e4d2aeec0e am: 0fb4dfadd6 am: 5bc8e2aad7  -s ours am: 85f8b08e86 am: c741c242b6 am: 3c3c4a9c3c am: 5b013a6193
am: fa5c0e9773  -s ours

Change-Id: Ic452b5992272071c9a477fce616fd1194a171e7d