Android m preview 1
Merge "Remove superfluous OpenSSL include paths."