Merge "Use libstagefright_foundation_vendor" into oc-dr1-dev am: ae87d7ddd0
am: f61381e21d

Change-Id: I8e2be9432327948884464ee05ab422d65da7a349