Merge "Add Makalu CPU lib" into integration