remove some old code

Change-Id: I6def6b8a9f141c22c4497f8956f8e4a7e7c4b707
some fixes for andriod

Change-Id: I97eadc88c1737ba8b474e6786e8c1017b2cb0206