tree 9eaf02eeeff13c2f203ccfcf9fb3e1b65fe07147
parent 9d1de5e3e9ef76de2b532796f7a551891aeba94d
parent 09c09e77ca51cf11ba949a2c49efee4c385c4a0c
author Sam Chiu <samchiu@google.com> 1558670986 +0800
committer Sam Chiu <samchiu@google.com> 1558671308 +0800

Merge commit '09c09e77ca51cf11ba949a2c49efee4c385c4a0c' into HEAD

And revert 8bc2d9ca to skip importing openssl lib.

Bug: 133125685
Test: None
Change-Id: Ie299b0acef5e233f74f3403d42d18e691473f8d9