Add keon option
Merge branch 'master' of https://github.com/reimago/gp_android