Merge "MediaCodec refactoring part 1-b: secure buffers"