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