Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp * commit '27123468b33cb61a1600079d583302b1b078b2ee': Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).