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

Change-Id: I123cc98202640afedae7854ef00daa02061f1be0