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

Change-Id: I4e7d44aae1663f1bc0f3d3954cccc8a6fc79bb18