Merge "Remove dead gglFastDivx." am: a02ca9e7ae am: 71797610f0
am: 49417befee

Change-Id: I33a219a81b9afe3574c858cf768340c9abd6d88b