Merge "Add std::string system property functions." am: 3f049c3f19
am: 621127a2cb

Change-Id: I95ad7284a08d9903bd9712653ad225588ca6fb47