Avoid to require non crossplatform packages

Change-Id: Icd8595d095a6ebd099235be158dcd16d92eb94b1
3 files changed