Merge "Add global macro for build-timeout"