Merge "Remove trailing newline from TARGET_C_INCLUDES"