fixed build problems on Linux

Change-Id: If5ff319777ddb2c9ddf9d14e8eb63bcf111189f0