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

* commit 'b98204a9fb5c84478a9710163df395486443c7f6':
  Move non-upstream code into the libc/bionic directory.