Makefile: Use -O2
cpu-boost_framework: Merge upstream