am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev

# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit 'f303a7fd774f97eca79bfa44eb7d25a394d0abf4':
  Revert "makefile changes for s.a.c"