fixing android build after directory restructure