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

Change-Id: I674655ae677573f4981b4cdeff6ee8849ba8fef5