Merge "Update TARGET_C_INCLUDES usage"