Merge "Remove libz_current hack." am: e1da7b924d am: d12db81b03

Change-Id: I9a5514289bb223b7582ac58765250feb059a274a