Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input" am: 460dcb750d
am: ba46fa9310

Change-Id: I1548575019cbb2f31e7ddd562e20b4448c027876