am 31167ffb: am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '31167ffb':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding