am 0d439d3d: Merge "Remove a bionic workaround."

* commit '0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e':
  Remove a bionic workaround.