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

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

Change-Id: Id31c8cc0fec3aebf09f7de363acb0805fde43bbd