Merge "[automerger skipped] Merge "Fix StagefrightTests" into pie-cts-dev am: 092fcfe180 -s ours
am: 3f613cd258 -s ours
am skip reason: change_id Icf03f341f55f97a43db5e8dcdf3da75c24e041ef with SHA1 e704304ac1 is in history

Change-Id: I3985b1503da29c5e14cb0aadbda77e7971ca738e