am a578ade2: am 1c4311cc: am 4af36f4e: am 96b1b403: am 4c01047e: makefile changes for s.a.c

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