Merge "Remove libz_current hack." am: e1da7b924d

Change-Id: I08c551e82b9208081d87307cb67725eb36fba0ee