Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad52565 am: 44eb369c" into nyc-mr2-dev-plus-aosp