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

* commit '3512ed49a0cecd103de62eb9869e60dab144a6fb':
  Support arch-specific LOCAL_C_INCLUDES.