diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 45dad49552f7..8a97442995cb 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-# Hint: git describe --abbrev=12 --match android-n-preview-3
-DISTVERSION=	n-preview-3-101
-DISTVERSIONSUFFIX=	-g35d84096e9a5
+# Hint: git describe --abbrev=12 --match android-n-preview-4
+DISTVERSION=	n-preview-4-74
+DISTVERSIONSUFFIX=	-g80beb506cf84
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
@@ -17,9 +17,11 @@ GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
 
 OPTIONS_DEFINE=	TEST_PYTHON
 
+TEST_BROKEN=	logging.* tests always fail after 4e5fd111d84d
+
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development
-TEST_PYTHON_GH_TAGNAME=	${GH_MYTAG}-47-g6925e3e:development
+TEST_PYTHON_GH_TAGNAME=	${GH_MYTAG}-6-g256e246:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 TEST_PYTHON_USES=	python:2.7,build
 
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index 779d0eac5d57..101705aba1ad 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66
-SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018
+SHA256 (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 552cd8e6500e7ee0149c59116ea2a560906fc1ecd3b557ea714f8c11269e6a7a
+SIZE (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 1558004
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
-SHA256 (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 9956ed223b1f10e70890f51b218f0672dee5818f967d1abf413008c829975d68
-SIZE (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 149186317
+SHA256 (android-platform_development-android-n-preview-4-6-g256e246_GH0.tar.gz) = 5caaa22733ebcb1110953b2a1ee9548f82634c4b8713d105137ac58689fea361
+SIZE (android-platform_development-android-n-preview-4-6-g256e246_GH0.tar.gz) = 149182859
diff --git a/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp b/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp
new file mode 100644
index 000000000000..eb3f09eab51a
--- /dev/null
+++ b/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp
@@ -0,0 +1,43 @@
+--- adb/adb_auth_host.cpp.orig	2016-06-29 23:43:15 UTC
++++ adb/adb_auth_host.cpp
+@@ -33,7 +33,9 @@
+ #include <crypto_utils/android_pubkey.h>
+ #include <cutils/list.h>
+ 
++#if defined(OPENSSL_IS_BORINGSSL)
+ #include <openssl/base64.h>
++#endif
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/pem.h>
+@@ -70,6 +72,30 @@ static std::string get_user_info() {
+     return " " + username + "@" + hostname;
+ }
+ 
++#if !defined(OPENSSL_IS_BORINGSSL)
++// https://boringssl.googlesource.com/boringssl/+/6601402%5E!/
++int EVP_EncodedLength(size_t *out_len, size_t len) {
++  if (len + 2 < len) {
++    return 0;
++  }
++  len += 2;
++  len /= 3;
++
++  if (((len << 2) >> 2) != len) {
++    return 0;
++  }
++  len <<= 2;
++
++  if (len + 1 < len) {
++    return 0;
++  }
++  len++;
++
++  *out_len = len;
++  return 1;
++}
++#endif
++
+ static bool write_public_keyfile(RSA* private_key, const std::string& private_key_path) {
+     uint8_t binary_key_data[ANDROID_PUBKEY_ENCODED_SIZE];
+     if (!android_pubkey_encode(private_key, binary_key_data, sizeof(binary_key_data))) {
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index 86ca37adf069..2f922c636e3c 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-# Hint: git describe --abbrev=12 --match android-n-preview-3
-DISTVERSION=	n-preview-3-101
-DISTVERSIONSUFFIX=	-g35d84096e9a5
+# Hint: git describe --abbrev=12 --match android-n-preview-4
+DISTVERSION=	n-preview-4-74
+DISTVERSIONSUFFIX=	-g80beb506cf84
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
-GH_TAGNAME=	${GH_MYTAG}-45-g86bebf8:extras \
+GH_TAGNAME=	${GH_MYTAG}-38-gd937202:extras \
 		${GH_MYTAG}:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index da61aabdd814..51469d809825 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -1,10 +1,10 @@
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66
-SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018
-SHA256 (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 0b08abf97108f7c2a6c56b728ecf8fbc34ec26f6b00e1ee002828eee9d5b7209
-SIZE (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 80661868
-SHA256 (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 3c90521a2f86064cb0968603972f7d1df45621a7407bfd62d5fdc25cd30a70e2
-SIZE (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 63015
+SHA256 (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 552cd8e6500e7ee0149c59116ea2a560906fc1ecd3b557ea714f8c11269e6a7a
+SIZE (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 1558004
+SHA256 (jbeich-platform_system_extras-android-n-preview-4-38-gd937202_GH0.tar.gz) = 2a6b991d4c5921ca89dc30f40361c71d4ebf55eb86744032e5efcc7a2af277c9
+SIZE (jbeich-platform_system_extras-android-n-preview-4-38-gd937202_GH0.tar.gz) = 81924921
+SHA256 (jbeich-platform_external_libselinux-android-n-preview-4_GH0.tar.gz) = 303f8c77786413cf6ea2a24a502c2e9e8a0348ae168f85a710f46b8acce0211c
+SIZE (jbeich-platform_external_libselinux-android-n-preview-4_GH0.tar.gz) = 63010
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948