am f2777de6: am 18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."

* commit 'f2777de63984114f30a3d4d73bacd8e4059ea5ea':
  Support arch-specific LOCAL_C_INCLUDES.