Merge "Fix StagefrightTests" into pi-dev am: 6fe536ae08
am: 0d689ae981

Change-Id: I1ef53ac64693f1ee8f01f37f1e00016ac4969b58