Index: head/devel/android-tools-simpleperf/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/Makefile	(revision 400395)
+++ head/devel/android-tools-simpleperf/Makefile	(revision 400396)
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	m-preview-219
-DISTVERSIONSUFFIX=	-gaf995fe
+DISTVERSION=	m-preview-752
+DISTVERSIONSUFFIX=	-g4ea2a41
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android simpleperf tool
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	llvm-config${LLVM_VER}:${PORTSDIR}/devel/llvm${LLVM_VER}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android:bionic,core jbeich
 GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
 		platform_system_extras
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-357-g55f87a0:bionic \
-		${DISTVERSIONFULL:C/-[0-9].*//}-1254-gfca4821:core
+GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2178-g1721be2:bionic \
+		${DISTVERSIONFULL:C/-[0-9].*//}-4458-g2470439:core
 
 USES=		compiler:c++11-lib uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}"
 ALL_TARGET=	all
 TEST_TARGET=	test
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (llvm deps)
 PLIST_FILES=	bin/simpleperf
 
 LLVM_VER?=	36 # XXX Move to DEFAULT_VERSIONS
 
 OPTIONS_DEFINE=	TEST
 
 TEST_BUILD_DEPENDS=	googletest>=1.6.0:${PORTSDIR}/devel/googletest
 TEST_ALL_TARGET=	simpleperf_test
 
 post-extract:
 # Adjust paths relative to extras
 	@(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC})
 	@${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic
 
 post-patch:
 # XXX C++ exception with description "regex_error" thrown in the test body.
 	@if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \
 		${REINPLACE_CMD} -Ee '/^TEST/\
 			s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \
 		${WRKSRC}/base/logging_test.cpp; \
 	fi
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-simpleperf/distinfo
===================================================================
--- head/devel/android-tools-simpleperf/distinfo	(revision 400395)
+++ head/devel/android-tools-simpleperf/distinfo	(revision 400396)
@@ -1,6 +1,6 @@
-SHA256 (jbeich-platform_system_extras-android-m-preview-219-gaf995fe_GH0.tar.gz) = e8d797e8764c693ba3f5b312368815747c9c331e7d5d2c71068ab99fedff6e29
-SIZE (jbeich-platform_system_extras-android-m-preview-219-gaf995fe_GH0.tar.gz) = 76449581
-SHA256 (android-platform_bionic-android-m-preview-357-g55f87a0_GH0.tar.gz) = bb0a72a7d84c2b18d5076581f97ac1c239329ee64f5150082f740f911be64a03
-SIZE (android-platform_bionic-android-m-preview-357-g55f87a0_GH0.tar.gz) = 3462941
-SHA256 (android-platform_system_core-android-m-preview-1254-gfca4821_GH0.tar.gz) = 0368607e5bc8e777746658f37be59d9f6c356d1265b24c0c128054c8d1b958eb
-SIZE (android-platform_system_core-android-m-preview-1254-gfca4821_GH0.tar.gz) = 1361953
+SHA256 (jbeich-platform_system_extras-android-m-preview-752-g4ea2a41_GH0.tar.gz) = 710286e8500c08f7b6d8fc0df6512a056200d036e0d17275a0c432a48a57f7d9
+SIZE (jbeich-platform_system_extras-android-m-preview-752-g4ea2a41_GH0.tar.gz) = 76520660
+SHA256 (android-platform_bionic-android-m-preview-2178-g1721be2_GH0.tar.gz) = 2ebe79bf3b31b025e286add79a45d4e2f867c9ed7e20658ac21235b257dde48d
+SIZE (android-platform_bionic-android-m-preview-2178-g1721be2_GH0.tar.gz) = 3473156
+SHA256 (android-platform_system_core-android-m-preview-4458-g2470439_GH0.tar.gz) = 43a05eb7849232d60f309bdf0b7d8136b0ce4308845c9b60273964cec93c7b1d
+SIZE (android-platform_system_core-android-m-preview-4458-g2470439_GH0.tar.gz) = 1374376
Index: head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h
===================================================================
--- head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h	(revision 400395)
+++ head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h	(revision 400396)
@@ -1,10 +1,10 @@
---- simpleperf/record.h.orig	2015-08-12 01:49:40 UTC
+--- simpleperf/record.h.orig	2015-10-26 20:57:19 UTC
 +++ simpleperf/record.h
-@@ -19,6 +19,7 @@
- 
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
  #include <sys/types.h>
  
 +#include <memory> // unique_ptr
+ #include <queue>
  #include <string>
  #include <vector>
-