Support and Test android libs were in wrong location