Fix ODR issue with dex2oat and libcrypto
am: 70f2314b46

Change-Id: I55ac283e34373ae9be78799aa240f1a03f64d04a