Merge "stagefright: Remove additional deep-copy of encoder buffers"