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

Change-Id: Ie678a26b02ce7b50130dbc003ef5e30528a4b3c6