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

Change-Id: I71d87fce28528a608792b2087951d302c8ddfc21