Fix build system warnings

Change-Id: If36fa8efbda4b3ea03da6b6da4d63dcbfedb701f