Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev am: 424a4be6b1
am: 778576ffdc

Change-Id: I8fa6f4b21d632f76fcb56efc774d0bddfad7f323