Merge "Refactor build logic."