Merge "Fix sw mpeg4 codec crash when p-vop of mp4-dp type  is at first after resubmit csd" am: a3db2b4c1f
am: a492fd670d

Change-Id: I4646c754f7f8682cfde189c3b3baa281c3a84a44