Remove android stuff
New file
New files
Remove from main src tree.  Move to android
Wrong place.  Moved