Make build compatible with android

Conceding we cannot operate on android until Feign (which rids cglib dep), this change prepares the build.