Merge "Add symlinks for bzip2."
am: 441b914026

Change-Id: I4bc46e358644e8468818aa57f7ea0fde9759363f