Merge "MediaCodec: clean up resources pending removal at init" am: 5381d98c9b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1444536

Change-Id: I17566126e390891136614a5f65fddab2955a1671