Merge "libutils: String\d+ make std_string private" am: 76850afa52
am: 2ebb1e5404

Change-Id: I19c7be5dc5e77d2cb33d9b38b08c1abf42281106