Merge "Use libstagefright_foundation_vendor" into oc-dr1-dev