moved to androidstudio/gradle based build