Android m preview
Merge "Switch libz.so to hash-style=both"