Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a

Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166