tweak to get building universally

Change-Id: I5760dc1fccb7ad726663727b9404e014da519755