Roll back the 6efd68422753574d07253851afa3ec4a24edf945.
Removed dependency of Android.
Successful build of the all project. However, the test case does not work.