Merge "[DO NOT MERGE] CTS test for FreeType update to 2.6.2" into klp-dev am: 2cb5629ffd am: 328e3a9603 am: f50e043acf  -s ours am: 397db29281  -s ours
am: 3755e5a7cb

Change-Id: I2845a97d1a2e4229ea60e0a10fd394fbe73ccd84