Fix universal AGL build
Merge pull request #342 from eile/master

Fix universal AGL build