Merge "Implement android::String access methods that avoid C string cast" into main