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

* commit '18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
  Support arch-specific LOCAL_C_INCLUDES.