Fix ODR issue with dex2oat and libcrypto am: 70f2314b46
am: 83d77e2385

Change-Id: I59dc19ff07437d5b61f7cb1d2f63de2caf0dd189