changes to android kit and aliases