Merge "stagefright: render video buffers"