AA: tools/cmake: update to latest version from trunk to fix build errors