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

Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d