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

Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53