Merge "C2SoftMpeg4Dec: fix null pointer dereference issue" am: 96f5c78c7d am: 9b1bf9e0bd am: 6ec073b94d

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

Change-Id: I7e6ebd09f39d0fa8a06ed96007bb9350409ebf10