Undo a bionic hack.

Bug: https://code.google.com/p/android/issues/detail?id=64374
Test: builds
Change-Id: I719523cd8cd2449f769c96702e01151b75328972
1 file changed