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

Change-Id: Id1ee0ad60d57ce63533024f883c1b359fa5421bd