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

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