Merge "Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1 am: c29da42e23 am: 9ab0a4da85 am: f35ee5186c am: 6e916592c8" into oc-mr1-dev-plus-aosp