Merge "Add a CTS test for FreeType update to 2.6.2+update" into lmp-dev am: 12ecedc29a
am: c75b862722

Change-Id: Ib156fbb20d7ed5dd4c66ca0213da02460bdcecf7