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

Change-Id: I0965142964addd115b6648bbfbb7d8db2e42dfe2