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

Change-Id: If392d8e94a7973026ae9f26beae944bfe7256c16