[automerger skipped] Replace string functions with safe alternatives am: cb7dde1668 am: cbd7fc76d1 am: a7f3300cd8 am: d8215c90e4 -s ours

am skip reason: Change-Id Ifa074b8c9db74966ed0a500bb8e063a8d4d870c4 with SHA-1 cb7dde1668 is in history

Change-Id: I03e8d050207de06c77033649d9b674f009a71c7f