Merge "feat(build): allow additional CFLAGS for library build" into integration