Unreviewed attempt to fix EFL and Mac/cmake builds after r209665.