Merge "Update stagefright makefile after dropping support for JSC"