Merge "Support arch-specific LOCAL_C_INCLUDES."