Merge android lib

Merge android library project back with the android project.