Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev