Merge "Add support for building presterastats tool"