Revert "Fixes to ease packaging"

This reverts commit a4baa60b.

* The patch affects cross-compiling when external dependencies
  already installed using OS package manager.

Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>

Approved-by: Jakub Sujak <jakub.sujak@arm.com>