Merge "stagefright: allow secure audio input buffer"