Fix issues caused by recent upgrade to Android Studio 0.5.7.  instrumentTests changed to androidTests

Change-Id: Id33890a2ec3da9ea8ec5be3a30db14b0c33c1f38
Reviewed-on: http://review.couchbase.org/36723
Tested-by: Traun Leyden <tleyden@couchbase.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>