Added combined android code

Added combined android code
Added modified design document