Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev