Fix CMake build

This fixes issues caused by:
 - a26c0ca3
 - b2e187c7
 - 07c22638
 - 80572fa9
 - 1c7da703
 - 1c7da703

Corresponding upstream commits:
 - 2f1e7074
 - 234d6367
 - 54c91a63
 - 2c988f40
 - 31918449
 - 9fd521fc

Change-Id: Id8fe9307f71262260d51aac81151d8ca66ca9e93