Merge "Move non-upstream code into the libc/bionic directory."