android boilerplate improvements