Remove a bionic workaround.

(Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.)

Change-Id: Ief968db33e2f9e1957510bbd59f25faa6828d678
Merge "Remove a bionic workaround."
Remove a bionic workaround.

(Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.)

(cherry-pick of 1d24ddc612489f57c23e78a5deaaad91f1bf6ce5.)

Change-Id: I7105b17c285ff24fb48be23cf2067aef37f36d45
am 0d439d3d: Merge "Remove a bionic workaround."

* commit '0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e':
  Remove a bionic workaround.
Merge remote-tracking branch 'aosp/master'