Rework per new android project structure

Change-Id: I8d4e89a10ca461af3c85ec521cb502902d347336
Reviewed-on: http://review.couchbase.org/33537
Reviewed-by: Eric Limare <eric.limare@couchbase.com>
Tested-by: Eric Limare <eric.limare@couchbase.com>