Merge "Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f am: c2b8b3f072 am: 0e4a89e436 am: fbf55f744a am: 018a538981" into oc-mr1-dev-plus-aosp