diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index f179aa21c0cc..9edd084dc0c3 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
-DISTVERSION?=	7.1.1_r4
-PORTREVISION?=	1
+DISTVERSION?=	7.1.2_r17
+PORTREVISION?=	0
 CATEGORIES=	devel comms
 .ifndef EXTRA_PATCHES
 PATCH_SITES=	https://github.com/android/platform_system_core/commit/
@@ -23,7 +23,7 @@ GH_PROJECT=	platform_system_core
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
-GH_REVISION=	5cf8bbd5b29d # generated by: make update-revision
+GH_REVISION=	1346a4012db4 # generated by: make update-revision
 .endif
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index 51761a31512e..2fd374a1fb99 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1477379212
-SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc
-SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590
+TIMESTAMP = 1495068953
+SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
 SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index a059dac889ef..0bc631afddb0 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
-DISTVERSION?=	7.1.1_r4
-PORTREVISION?=	1
+DISTVERSION?=	7.1.2_r17
+PORTREVISION?=	0
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
 DISTFILES=	fastboot.1?id=706e754:manpage
@@ -28,7 +28,7 @@ GH_SUBDIR=	libselinux:libselinux
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
-GH_REVISION=	5cf8bbd5b29d # generated by: make update-revision
+GH_REVISION=	1346a4012db4 # generated by: make update-revision
 .endif
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo
index c4eb74a06167..b6d2b4192644 100644
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1477379212
+TIMESTAMP = 1495068953
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc
-SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590
-SHA256 (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 72c758f5f4fe69b5f4e2f46ceb78ca7240e2968bea63505c45158b6ef56bc09f
-SIZE (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 79624857
-SHA256 (jbeich-platform_external_libselinux-android-7.1.1_r4_GH0.tar.gz) = 7d79b146e4355d721c14a2712868fa9af9eb991c194e0b6452d4c121300aca62
-SIZE (jbeich-platform_external_libselinux-android-7.1.1_r4_GH0.tar.gz) = 59766
+SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
+SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
+SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7
+SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile
index 61367dde758a..120d6ef72b1e 100644
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	7.1.1_r4
-PORTREVISION=	1
+DISTVERSION=	7.1.2_r17
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/android-tools-simpleperf/distinfo b/devel/android-tools-simpleperf/distinfo
index c338119247a6..d8204c5fba17 100644
--- a/devel/android-tools-simpleperf/distinfo
+++ b/devel/android-tools-simpleperf/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1477379212
-SHA256 (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 72c758f5f4fe69b5f4e2f46ceb78ca7240e2968bea63505c45158b6ef56bc09f
-SIZE (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 79624857
-SHA256 (android-platform_bionic-android-7.1.1_r4_GH0.tar.gz) = 5df4a9d8fcc5653a55fedaa43baba0ba2cf23aa8e7936ea39f382d96adf7954f
-SIZE (android-platform_bionic-android-7.1.1_r4_GH0.tar.gz) = 3515656
-SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc
-SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590
+TIMESTAMP = 1495068953
+SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
+SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
+SHA256 (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
+SIZE (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
+SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372