Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I9cef0b35e751620a2d263fac557aa69fd7b1c80d
diff --git a/sl4n/rapidjson/.gitmodules b/sl4n/rapidjson/.gitmodules
deleted file mode 100644
index 8e9d1f3..0000000
--- a/sl4n/rapidjson/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "thirdparty/gtest"]
-	path = thirdparty/gtest
-	url = https://chromium.googlesource.com/external/googletest.git