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

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