Merge "Fix references to libcrypto_utils_static." am: 879a2c8fa0
am: 8b2ebbc4cf

Change-Id: I3e649cea60b756a3abc83898873e8aa7fba5ea11