Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev