Bug 25161109

This reverts commit 810f99be.
It was only a workaround, which we no longer need after removing
the libandroid dependency which caused circular symbol resolves.

Change-Id: I0b486b5acfd328c0f64379e2c2dc2db00626738f
Reviewed-on: https://swiftshader-review.googlesource.com/4130Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>