Moved addon/**/android-tools to android-tools