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

Change-Id: Ib7397feea2874a1b9d3378b9065091d24d64d7bb