Remove rebase junk, update CMakeLists.txt, update Android.mk.