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 (1)
* commit 'a95a64ddd6155e90308aa1368e2c8098d86e677f':
  Revert "makefile changes for s.a.c"