Fix --with-export-validation check

Change-Id: I12b99b361a10f48435694719870ed16f2ce4a31a