Android 7.1.0 release 3
[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
am: 99748bb350  -s ours

* commit '99748bb350b2a34821953d97ca4ca185ad2e6c08':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0