Android 6.0.1 release 22
Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c am: 002b86b103  -s ours am: 7a94d8b8e4 am: b0b034a8f5
am: b25bb87ac7

* commit 'b25bb87ac776192cb6a992b3e22d81d4c98755bd':
  CTS test for robust handling of invalid cmap