Added support for x86 and Android Lollipop