[OS-BUILD PATCHv13 6/11] Extract rules to allow orthogonal configuration