Merge "Build a prebuilt bzip2." am: 52eecb65ba am: 7e00460009
am: 90a6933165

Change-Id: I7c5cf5495eab4b85f2ef3fb24f0f7db53efc65e3