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
am: 33e76e05a3

Change-Id: I09e13de158a6de8e283e8e62c7eafdccc562d76b