Merge "Make bzip2 available for the host too." am: 956e233d9a
am: 07f95641bc

Change-Id: I47f8a3f49a05af3ac79dbf7a7ee22ecf60604bf2