Merge "Correct makefile test for stagefright build"