Merge "Renamed apkzlib packages." into studio-master-dev am: bef0e6c190
am: 40cf62a9df

Change-Id: I55ec1538a69c333368f3f0408fda4b9ca0f849bb