Merge "stagefright: use ColorUtils to determine RGB matrix" into udc-dev