Merge "Use -Werror in external/freetype"
am: 51036df35f

Change-Id: I30d856a5b3a27eee90bdec13657a03cf61b584f0