Merge "Convert make to bp" into tm-qpr-dev