diff --git a/Common/Buffer.cpp b/Common/Buffer.cpp
index 423c2cfb3c..68c7e7682e 100644
--- a/Common/Buffer.cpp
+++ b/Common/Buffer.cpp
@@ -196,7 +196,7 @@ bool Buffer::ReadAll(int fd, int hintSize) {
 	}
 
 	while (true) {
-		int retval = recv(fd, &buf[0], (int)buf.size(), 0);
+		int retval = recv(fd, &buf[0], (int)buf.size(), MSG_NOSIGNAL);
 		if (retval == 0) {
 			break;
 		} else if (retval < 0) {
@@ -228,7 +228,7 @@ bool Buffer::ReadAllWithProgress(int fd, int knownSize, float *progress, bool *c
 				return false;
 			ready = fd_util::WaitUntilReady(fd, CANCEL_INTERVAL, false);
 		}
-		int retval = recv(fd, &buf[0], (int)buf.size(), 0);
+		int retval = recv(fd, &buf[0], (int)buf.size(), MSG_NOSIGNAL);
 		if (retval == 0) {
 			return true;
 		} else if (retval < 0) {
@@ -248,7 +248,7 @@ int Buffer::Read(int fd, size_t sz) {
 	char buf[1024];
 	int retval;
 	size_t received = 0;
-	while ((retval = recv(fd, buf, (int)std::min(sz, sizeof(buf)), 0)) > 0) {
+	while ((retval = recv(fd, buf, (int)std::min(sz, sizeof(buf)), MSG_NOSIGNAL)) > 0) {
 		if (retval < 0) {
 			return retval;
 		}
diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp
index 1a7c6cffaa..113dc8200a 100644
--- a/Common/LogManager.cpp
+++ b/Common/LogManager.cpp
@@ -156,6 +156,9 @@ LogManager::~LogManager() {
 #endif
 	}
 
+	// Make sure we don't shutdown while logging.  RemoveListener locks too, but there are gaps.
+	std::lock_guard<std::mutex> listeners_lock(listeners_lock_);
+
 	if (fileLog_)
 		delete fileLog_;
 #if !defined(MOBILE_DEVICE) || defined(_DEBUG)
@@ -262,6 +265,7 @@ bool LogManager::IsEnabled(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type)
 }
 
 void LogManager::Init(bool *enabledSetting) {
+	_assert_(logManager_ == nullptr);
 	logManager_ = new LogManager(enabledSetting);
 }
 
diff --git a/Common/Math/expression_parser.cpp b/Common/Math/expression_parser.cpp
index 9499cce7e0..e24c056a07 100644
--- a/Common/Math/expression_parser.cpp
+++ b/Common/Math/expression_parser.cpp
@@ -462,7 +462,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs,
 				break;
 			case EXOP_SIGNMINUS:	// -0
 				if (useFloat)
-					valueStack.push_back(0.0 - fArg[0]);
+					valueStack.push_back((uint32_t)(0.0f - fArg[0]));
 				else
 					valueStack.push_back(0-arg[0]);
 				break;
@@ -474,7 +474,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs,
 				break;
 			case EXOP_MUL:			// a*b
 				if (useFloat)
-					valueStack.push_back(fArg[1]*fArg[0]);
+					valueStack.push_back((uint32_t)(fArg[1] * fArg[0]));
 				else
 					valueStack.push_back(arg[1]*arg[0]);
 				break;
@@ -485,7 +485,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs,
 					return false;
 				}
 				if (useFloat)
-					valueStack.push_back(fArg[1]/fArg[0]);
+					valueStack.push_back((uint32_t)(fArg[1] / fArg[0]));
 				else
 					valueStack.push_back(arg[1]/arg[0]);
 				break;
@@ -499,13 +499,13 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs,
 				break;
 			case EXOP_ADD:			// a+b
 				if (useFloat)
-					valueStack.push_back(fArg[1]+fArg[0]);
+					valueStack.push_back((uint32_t)(fArg[1] + fArg[0]));
 				else
 					valueStack.push_back(arg[1]+arg[0]);
 				break;
 			case EXOP_SUB:			// a-b
 				if (useFloat)
-					valueStack.push_back(fArg[1]-fArg[0]);
+					valueStack.push_back((uint32_t)(fArg[1] - fArg[0]));
 				else
 					valueStack.push_back(arg[1]-arg[0]);
 				break;
diff --git a/Common/Net/HTTPClient.cpp b/Common/Net/HTTPClient.cpp
index b8be625400..7193582fa5 100644
--- a/Common/Net/HTTPClient.cpp
+++ b/Common/Net/HTTPClient.cpp
@@ -366,6 +366,7 @@ int Client::ReadResponseHeaders(Buffer *readbuf, std::vector<std::string> &respo
 	if (code_pos != line.npos) {
 		code = atoi(&line[code_pos]);
 	} else {
+		ERROR_LOG(IO, "Code not parse HTTP status code");
 		return -1;
 	}
 
@@ -377,6 +378,7 @@ int Client::ReadResponseHeaders(Buffer *readbuf, std::vector<std::string> &respo
 	}
 
 	if (responseHeaders.size() == 0) {
+		ERROR_LOG(IO, "No HTTP response headers");
 		return -1;
 	}
 
diff --git a/Common/Net/HTTPHeaders.cpp b/Common/Net/HTTPHeaders.cpp
index acb554ee70..ef19d3bc9d 100644
--- a/Common/Net/HTTPHeaders.cpp
+++ b/Common/Net/HTTPHeaders.cpp
@@ -33,7 +33,7 @@ bool RequestHeader::GetParamValue(const char *param_name, std::string *value) co
   for (size_t i = 0; i < v.size(); i++) {
     std::vector<std::string> parts;
 		SplitString(v[i], '=', parts);
-    INFO_LOG(IO, "Param: %s Value: %s", parts[0].c_str(), parts[1].c_str());
+    DEBUG_LOG(IO, "Param: %s Value: %s", parts[0].c_str(), parts[1].c_str());
     if (parts[0] == param_name) {
       *value = parts[1];
       return true;
@@ -121,13 +121,13 @@ int RequestHeader::ParseHttpHeader(const char *buffer) {
   if (!strncasecmp(key, "User-Agent", key_len)) {
     user_agent = new char[value_len + 1];
     memcpy(user_agent, buffer, value_len + 1);
-    INFO_LOG(IO, "user-agent: %s", user_agent);
+    VERBOSE_LOG(IO, "user-agent: %s", user_agent);
   } else if (!strncasecmp(key, "Referer", key_len)) {
     referer = new char[value_len + 1];
     memcpy(referer, buffer, value_len + 1);
   } else if (!strncasecmp(key, "Content-Length", key_len)) {
     content_length = atoi(buffer);
-    INFO_LOG(IO, "Content-Length: %i", (int)content_length);
+	VERBOSE_LOG(IO, "Content-Length: %i", (int)content_length);
   } else {
 	  std::string key_str(key, key_len);
 	  std::transform(key_str.begin(), key_str.end(), key_str.begin(), tolower);
@@ -150,12 +150,12 @@ void RequestHeader::ParseHeaders(net::InputSink *sink) {
 		line_count++;
 		if (type == SIMPLE) {
 			// Done!
-			INFO_LOG(IO, "Simple: Done parsing http request.");
+			VERBOSE_LOG(IO, "Simple: Done parsing http request.");
 			break;
 		}
 	}
 
-	INFO_LOG(IO, "finished parsing request.");
+	VERBOSE_LOG(IO, "finished parsing request.");
 	ok = line_count > 1;
 }
 
diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp
index da114da85a..1deb45f72c 100644
--- a/Common/Net/HTTPServer.cpp
+++ b/Common/Net/HTTPServer.cpp
@@ -54,7 +54,7 @@ Request::Request(int fd)
 	header_.ParseHeaders(in_);
 
 	if (header_.ok) {
-		INFO_LOG(IO, "The request carried with it %i bytes", (int)header_.content_length);
+		VERBOSE_LOG(IO, "The request carried with it %i bytes", (int)header_.content_length);
 	} else {
 	    Close();
 	}
@@ -171,8 +171,13 @@ bool Server::Listen4(int port) {
 	setsockopt(listener_, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
 
 	if (bind(listener_, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+#if PPSSPP_PLATFORM(WINDOWS)
+		int err = WSAGetLastError();
+#else
+		int err = errno;
+#endif
+		ERROR_LOG(IO, "Failed to bind to port %d, error=%d - Bailing (ipv4)", port, err);
 		closesocket(listener_);
-		ERROR_LOG(IO, "Failed to bind to port %d. Bailing.", port);
 		return false;
 	}
 
@@ -216,8 +221,13 @@ bool Server::Listen6(int port, bool ipv6_only) {
 	setsockopt(listener_, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&opt, sizeof(opt));
 
 	if (bind(listener_, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+#if PPSSPP_PLATFORM(WINDOWS)
+		int err = WSAGetLastError();
+#else
+		int err = errno;
+#endif
+		ERROR_LOG(IO, "Failed to bind to port %d, error=%d - Bailing (ipv6)", port, err);
 		closesocket(listener_);
-		ERROR_LOG(IO, "Failed to bind to port %d. Bailing.", port);
 		return false;
 	}
 
diff --git a/Common/Net/Sinks.cpp b/Common/Net/Sinks.cpp
index ff1e09aa63..86f3841e26 100644
--- a/Common/Net/Sinks.cpp
+++ b/Common/Net/Sinks.cpp
@@ -176,7 +176,7 @@ void InputSink::Fill() {
 		// Whatever isn't valid and follows write_ is what's available.
 		size_t avail = BUFFER_SIZE - std::max(write_, valid_);
 
-		int bytes = recv(fd_, buf_ + write_, (int)avail, 0);
+		int bytes = recv(fd_, buf_ + write_, (int)avail, MSG_NOSIGNAL);
 		AccountFill(bytes);
 	}
 }
@@ -399,6 +399,14 @@ void OutputSink::AccountPush(size_t bytes) {
 
 void OutputSink::AccountDrain(int bytes) {
 	if (bytes < 0) {
+#if PPSSPP_PLATFORM(WINDOWS)
+		int err = WSAGetLastError();
+		if (err == WSAEWOULDBLOCK)
+			return;
+#else
+		if (errno == EWOULDBLOCK || errno == EAGAIN)
+			return;
+#endif
 		ERROR_LOG(IO, "Error writing to socket");
 		return;
 	}
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 7880268327..9e3a30adb0 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -68,11 +68,6 @@
 #include "Common/CommonWindows.h"
 #endif
 
-#ifdef ANDROID_NDK_PROFILER
-#include <stdlib.h>
-#include "android/android-ndk-profiler/prof.h"
-#endif
-
 #include <sstream>
 
 bool MainScreen::showHomebrewTab = false;
@@ -1372,12 +1367,6 @@ UI::EventReturn MainScreen::OnExit(UI::EventParams &e) {
 	// Request the framework to exit cleanly.
 	System_SendMessage("finish", "");
 
-#ifdef __ANDROID__
-#ifdef ANDROID_NDK_PROFILER
-	moncleanup();
-#endif
-#endif
-
 	UpdateUIState(UISTATE_EXIT);
 	return UI::EVENT_DONE;
 }
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index d51adad672..39665dc9ff 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -137,12 +137,6 @@ Atlas g_ui_atlas;
 #include <mach-o/dyld.h>
 #endif
 
-// https://github.com/richq/android-ndk-profiler
-#ifdef ANDROID_NDK_PROFILER
-#include <stdlib.h>
-#include "android/android-ndk-profiler/prof.h"
-#endif
-
 ScreenManager *screenManager;
 std::string config_filename;
 
@@ -1402,14 +1396,6 @@ void NativeShutdown() {
 #endif
 	g_Config.Save("NativeShutdown");
 
-	// Avoid shutting this down when restarting core.
-	if (!restarting)
-		LogManager::Shutdown();
-
-#ifdef ANDROID_NDK_PROFILER
-	moncleanup();
-#endif
-
 	INFO_LOG(SYSTEM, "NativeShutdown called");
 
 	ShutdownWebServer();
@@ -1420,6 +1406,10 @@ void NativeShutdown() {
 
 	g_Discord.Shutdown();
 
+	// Avoid shutting this down when restarting core.
+	if (!restarting)
+		LogManager::Shutdown();
+
 	if (logger) {
 		delete logger;
 		logger = nullptr;
diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp
index d59874d680..4d415b7c8a 100644
--- a/Windows/DinputDevice.cpp
+++ b/Windows/DinputDevice.cpp
@@ -203,7 +203,7 @@ DinputDevice::~DinputDevice() {
 	}
 }
 
-void SendNativeAxis(int deviceId, short value, short &lastValue, int axisId) {
+void SendNativeAxis(int deviceId, int value, int &lastValue, int axisId) {
 	if (value == lastValue)
 		return;
 
@@ -216,11 +216,14 @@ void SendNativeAxis(int deviceId, short value, short &lastValue, int axisId) {
 	lastValue = value;
 }
 
-inline float Signs(short val) {
+inline int Signs(int val) {
 	return (0 < val) - (val < 0);
 }
 
-inline float LinearMaps(short val, short a0, short a1, short b0, short b1) {
+inline int LinearMaps(int val, int a0, int a1, int b0, int b1) {
+	return b0 + (((val - a0) * (b1 - b0)) / (a1 - a0));
+}
+inline float LinearMaps(float val, float a0, float a1, float b0, float b1) {
 	return b0 + (((val - a0) * (b1 - b0)) / (a1 - a0));
 }
 
@@ -244,11 +247,11 @@ int DinputDevice::UpdateState() {
 		axis.deviceId = DEVICE_ID_PAD_0 + pDevNum;
 
 		// Circle to Square mapping, cribbed from XInputDevice
-		float sx = js.lX;
-		float sy = js.lY;
+		float sx = (float)js.lX;
+		float sy = (float)js.lY;
 		float scaleFactor = sqrtf((sx * sx + sy * sy) / std::max(sx * sx, sy * sy));
-		js.lX = (short)(sx * scaleFactor);
-		js.lY = (short)(sy * scaleFactor);
+		js.lX = (int)(sx * scaleFactor);
+		js.lY = (int)(sy * scaleFactor);
 		
 		// Linear range mapping (used to invert deadzones)
 		float dz = g_Config.fDInputAnalogDeadzone;
@@ -257,20 +260,20 @@ int DinputDevice::UpdateState() {
 		float md = std::max(dz, idz);
 		float st = g_Config.fDInputAnalogSensitivity;
 
-		float magnitude = sqrtf(js.lX * js.lX + js.lY * js.lY);
+		float magnitude = sqrtf((float)(js.lX * js.lX + js.lY * js.lY));
 		if (magnitude > dz * 10000.0f) {
 			if (idzm == 1)
 			{
-				short xSign = Signs(js.lX);
-				if (xSign != 0.0f) {
-					js.lX = LinearMaps(js.lX, xSign * (short)(dz * 10000), xSign * 10000, xSign * (short)(md * 10000), xSign * 10000 * st);
+				int xSign = Signs(js.lX);
+				if (xSign != 0) {
+					js.lX = LinearMaps(js.lX, xSign * (int)(dz * 10000), xSign * 10000, xSign * (int)(md * 10000), xSign * (int)(st * 10000));
 				}
 			}
 			else if (idzm == 2)
 			{
-				short ySign = Signs(js.lY);
-				if (ySign != 0.0f) {
-					js.lY = LinearMaps(js.lY, ySign * (short)(dz * 10000.0f), ySign * 10000, ySign * (short)(md * 10000.0f), ySign * 10000 * st);
+				int ySign = Signs(js.lY);
+				if (ySign != 0) {
+					js.lY = LinearMaps(js.lY, ySign * (int)(dz * 10000.0f), ySign * 10000, ySign * (int)(md * 10000.0f), ySign * (int)(st * 10000));
 				}
 			}
 			else if (idzm == 3)
diff --git a/Windows/DinputDevice.h b/Windows/DinputDevice.h
index 796b5e265c..d8ecc8762f 100644
--- a/Windows/DinputDevice.h
+++ b/Windows/DinputDevice.h
@@ -62,10 +62,10 @@ private:
 	bool                    analog;
 	BYTE                    lastButtons_[128];
 	WORD                    lastPOV_[4];
-	short                   last_lX_;
-	short                   last_lY_;
-	short                   last_lZ_;
-	short                   last_lRx_;
-	short                   last_lRy_;
-	short                   last_lRz_;
+	int                     last_lX_;
+	int                     last_lY_;
+	int                     last_lZ_;
+	int                     last_lRx_;
+	int                     last_lRy_;
+	int                     last_lRz_;
 };
diff --git a/android/android-ndk-profiler/Android.mk b/android/android-ndk-profiler/Android.mk
deleted file mode 100644
index 6637e64853..0000000000
--- a/android/android-ndk-profiler/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-TARGET_thumb_release_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_thumb_release_CFLAGS))
-TARGET_thumb_release_CFLAGS := $(filter-out -fomit-frame-pointer,$(TARGET_thumb_release_CFLAGS))
-TARGET_arm_release_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_arm_release_CFLAGS))
-TARGET_arm_release_CFLAGS := $(filter-out -fomit-frame-pointer,$(TARGET_arm_release_CFLAGS))
-TARGET_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_CFLAGS))
-
-LOCAL_PATH := $(call my-dir)
-
-# include libandprof.a in the build
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-ndk-profiler
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libandroid-ndk-profiler.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_EXPORT_LDLIBS := -llog
-include $(PREBUILT_STATIC_LIBRARY)
diff --git a/android/android-ndk-profiler/COPYING b/android/android-ndk-profiler/COPYING
deleted file mode 100644
index 94a9ed024d..0000000000
--- a/android/android-ndk-profiler/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/android/android-ndk-profiler/README.mkd b/android/android-ndk-profiler/README.mkd
deleted file mode 100644
index 1897a2895b..0000000000
--- a/android/android-ndk-profiler/README.mkd
+++ /dev/null
@@ -1,5 +0,0 @@
-Profile Android NDK code. Further instructions here:
-
-http://code.google.com/p/android-ndk-profiler/wiki/Usage
-
-[![Build Status](https://travis-ci.org/richq/android-ndk-profiler.png)](https://travis-ci.org/richq/android-ndk-profiler)
diff --git a/android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a b/android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a
deleted file mode 100644
index 39479f1653..0000000000
Binary files a/android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a and /dev/null differ
diff --git a/android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a b/android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a
deleted file mode 100644
index 2ab6d9ce7a..0000000000
Binary files a/android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a and /dev/null differ
diff --git a/android/android-ndk-profiler/prof.h b/android/android-ndk-profiler/prof.h
deleted file mode 100644
index 2448612761..0000000000
--- a/android/android-ndk-profiler/prof.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Part of the android-ndk-profiler library.
- * Copyright (C) Richard Quirk
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- */
-#ifndef prof_h_seen
-#define prof_h_seen
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void monstartup(const char *libname);
-void moncleanup(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index a6cdedb5bd..1b7bde5a44 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -696,10 +696,6 @@ $(call import-module,libzip)
 $(call import-module,glslang-build)
 $(call import-module,miniupnp-build)
 
-ifeq ($(ANDROID_NDK_PROFILER),1)
-  $(call import-module,android-ndk-profiler)
-endif
-
 jni/$(SRC)/git-version.cpp:
 	-./git-version-gen.sh
 	-..\Windows\git-version-gen.cmd
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index d18d5d6e85..532693d05b 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -80,9 +80,3 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavutil.a
   LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/arm64/include
 endif
-
-# Compile with profiling.
-ifeq ($(ANDROID_NDK_PROFILER),1)
-  LOCAL_CFLAGS += -pg -DANDROID_NDK_PROFILER
-  LOCAL_STATIC_LIBRARIES += android-ndk-profiler
-endif
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 0f16a53552..4e64bb01ec 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -38,12 +38,6 @@
 #include "SDLHeadlessHost.h"
 #endif
 
-// https://github.com/richq/android-ndk-profiler
-#ifdef ANDROID_NDK_PROFILER
-#include <stdlib.h>
-#include "android/android-ndk-profiler/prof.h"
-#endif
-
 #if defined(ANDROID)
 JNIEnv *getEnv() {
 	return nullptr;
@@ -230,12 +224,6 @@ int main(int argc, const char* argv[])
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
-#ifdef ANDROID_NDK_PROFILER
-	setenv("CPUPROFILE_FREQUENCY", "500", 1);
-	setenv("CPUPROFILE", "/sdcard/gmon.out", 1);
-	monstartup("ppsspp_headless");
-#endif
-
 	bool fullLog = false;
 	bool autoCompare = false;
 	bool verbose = false;
@@ -478,9 +466,5 @@ int main(int argc, const char* argv[])
 	LogManager::Shutdown();
 	delete printfLogger;
 
-#ifdef ANDROID_NDK_PROFILER
-	moncleanup();
-#endif
-
 	return 0;
 }