Merge "Revert "Use NO_IMEMORY version of libstagefright_foundation for apex"" into rvc-dev