Merge "frameworks/base: move Zip* from libandroidfw to libutils"