Revert "Temp: fix compile errors"

This reverts commit 9d9b7652e61064ca1e6771880806d51de72ba862.
Android: Fix for 64bit arm and x86_64 targets

tested on kitkat arm and lollipop x86_64/arm64

Change-Id: I6049c7d935f08db51bea8f3fb98fe025171f2ef9
Default to L's bionic