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