Consolidated build inter predictors

Code cleanup.

Change-Id: Ic8b0167851116c64ddf08e8a3d302fb09ab61146
5 files changed