Merge "stagefright: MediaCodec buffer API revision"