am 96b1b403: am 4c01047e: makefile changes for s.a.c

# Via Android Git Automerger (1) and Robert Ly (1)
* commit '96b1b403b6ecf0daa2d7d0a8475e0d087790e457':
  makefile changes for s.a.c