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

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