Merge "Fix misc-macro-parentheses warnings in boot_control_copy."