finally get back to the master branch, clean up android files