android dir added and did some fixes