Works with the non-system bzip2; the --with-system case might still need some
love - but then again, distros want to have the online update switched off
anyway...

Change-Id: I26a27aec07a8f1aac22a4d14a38fb5b833550ea7