Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad5256547 am: 44eb369c83" into nyc-mr2-dev-plus-aosp
am: 473e674143

Change-Id: I25e54403e7d41e5e897654ce71e6919d48503a1f