diff --git a/android/3rd_party/gridlayout/AndroidManifest.xml b/android/3rd_party/gridlayout/AndroidManifest.xml
deleted file mode 100644
index 97f7be8d2c..0000000000
--- a/android/3rd_party/gridlayout/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.v7.gridlayout">
-    <uses-sdk android:minSdkVersion="7"/>
-    <application />
-</manifest>
diff --git a/android/3rd_party/gridlayout/README.txt b/android/3rd_party/gridlayout/README.txt
deleted file mode 100644
index 3c214fd68e..0000000000
--- a/android/3rd_party/gridlayout/README.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Library Project including compatibility GridLayout.
-
-This can be used by an Android project to provide
-access to GridLayout on applications running on API 7+.
-
-There is technically no source, but the src folder is necessary
-to ensure that the build system works.  The content is actually
-located in libs/android-support-v7-gridlayout.jar.
-The accompanying resources must also be included in the application.
-
-
-USAGE:
-
-Make sure you use <android.support.v7.widget.GridLayout> in your
-layouts instead of <GridLayout>.
-Same for <android.support.v7.widget.Space> instead of <Space>.
-
-Additionally, all of GridLayout's attributes should be put in the
-namespace of the app, as those attributes have been redefined in
-the library so that it can run on older platforms that don't offer
-those attributes in their namespace.
-
-To know which attributes need the application namespace, look at
-the two declare-styleable declared in res/values/attrs.xml
-
-
-
-For instance:
-
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"  <==== the namespace used for the library project
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:columnCount="6" >                                <===== notice how we're using app:columnCount here, not android:columnCount!
-
-    <Button
-        android:id="@+id/button1"
-        app:layout_column="1"                            <=== again, note the app: namespace
-        app:layout_columnSpan="2"
-        app:layout_gravity="left"
-        app:layout_row="1"
-        android:text="Button" />
-
-    <CheckBox
-        android:id="@+id/checkBox1"
-        app:layout_column="4"
-        app:layout_gravity="left"
-        app:layout_row="2"
-        android:text="CheckBox" />
-
-    <Button
-        android:id="@+id/button2"
-        app:layout_column="5"
-        app:layout_gravity="left"
-        app:layout_row="3"
-        android:text="Button" />
-
-    <android.support.v7.widget.Space                    <=== space widgets also need the full support package path
-        android:layout_width="21dp"                     <=== use the android namespace for width, height etc -- only use app: for the grid layout library's new resources
-        android:layout_height="1dp"
-        app:layout_column="0"
-        app:layout_gravity="fill_horizontal"
-        app:layout_row="0" />
diff --git a/android/3rd_party/gridlayout/build.xml b/android/3rd_party/gridlayout/build.xml
deleted file mode 100644
index 980e1018df..0000000000
--- a/android/3rd_party/gridlayout/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="gridlayout" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/android/3rd_party/gridlayout/libs/android-support-v7-gridlayout.jar b/android/3rd_party/gridlayout/libs/android-support-v7-gridlayout.jar
deleted file mode 100644
index a02db9d66e..0000000000
Binary files a/android/3rd_party/gridlayout/libs/android-support-v7-gridlayout.jar and /dev/null differ
diff --git a/android/3rd_party/gridlayout/proguard-project.txt b/android/3rd_party/gridlayout/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/android/3rd_party/gridlayout/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/android/3rd_party/gridlayout/project.properties b/android/3rd_party/gridlayout/project.properties
deleted file mode 100644
index db721fd897..0000000000
--- a/android/3rd_party/gridlayout/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-8
-android.library=true
diff --git a/android/3rd_party/gridlayout/res/values/attrs.xml b/android/3rd_party/gridlayout/res/values/attrs.xml
deleted file mode 100644
index ab3bc2307b..0000000000
--- a/android/3rd_party/gridlayout/res/values/attrs.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <declare-styleable name="GridLayout">
-
-        <!--
-              support versions. All attributes not present in ViewGroup/View are
-              redefined in the support library namespace.
-        -->
-
-
-        <!--
-        The orientation property is not used during layout. It is only used to
-        allocate row and column parameters when they are not specified by its children's
-        layout parameters. GridLayout works like LinearLayout in this case;
-        putting all the components either in a single row or in a single column -
-        depending on the value of this flag. In the horizontal case, a columnCount
-        property may be additionally supplied to force new rows to be created when a
-        row is full. The rowCount attribute may be used similarly in the vertical case.
-        The default is horizontal.
-        -->
-        <attr name="orientation">
-
-            <!-- Defines an horizontal widget. -->
-            <enum name="horizontal" value="0" />
-            <!-- Defines a vertical widget. -->
-            <enum name="vertical" value="1" />
-        </attr>
-        <!-- The maximum number of rows to create when automatically positioning children. -->
-        <attr name="rowCount" format="integer" />
-        <!-- The maximum number of columns to create when automatically positioning children. -->
-        <attr name="columnCount" format="integer" />
-        <!--
-        When set to true, tells GridLayout to use default margins when none are specified
-        in a view's layout parameters.
-        The default value is false.
-        See {@link android.widget.GridLayout#setUseDefaultMargins(boolean)}.
-        -->
-        <attr name="useDefaultMargins" format="boolean" />
-        <!--
-        When set to alignMargins, causes alignment to take place between the outer
-        boundary of a view, as defined by its margins. When set to alignBounds,
-        causes alignment to take place between the edges of the view.
-        The default is alignMargins.
-        See {@link android.widget.GridLayout#setAlignmentMode(int)}.
-        -->
-        <attr name="alignmentMode">
-
-            <!--
-            Align the bounds of the children.
-            See {@link android.widget.GridLayout#ALIGN_BOUNDS}.
-            -->
-            <enum name="alignBounds" value="0" />
-            <!--
-            Align the margins of the children.
-            See {@link android.widget.GridLayout#ALIGN_MARGINS}.
-            -->
-            <enum name="alignMargins" value="1" />
-        </attr>
-        <!--
-        When set to true, forces row boundaries to appear in the same order
-        as row indices.
-        The default is true.
-        See {@link android.widget.GridLayout#setRowOrderPreserved(boolean)}.
-        -->
-        <attr name="rowOrderPreserved" format="boolean" />
-        <!--
-        When set to true, forces column boundaries to appear in the same order
-        as column indices.
-        The default is true.
-        See {@link android.widget.GridLayout#setColumnOrderPreserved(boolean)}.
-        -->
-        <attr name="columnOrderPreserved" format="boolean" />
-    </declare-styleable>
-    <declare-styleable name="GridLayout_Layout">
-
-        <!--
-              support versions. All attributes not present in MarginLayout are
-              redefined in the support library name space.
-        -->
-
-
-        <!-- START MarginLayout layoutparams -->
-
-        <attr name="android:layout_width" />
-        <attr name="android:layout_height" />
-        <!--
-              Specifies extra space on the left, top, right and bottom
-              sides of this view. This space is outside this view's bounds.
-        -->
-        <attr name="android:layout_margin" />
-        <!--
-              Specifies extra space on the left side of this view.
-              This space is outside this view's bounds.
-        -->
-        <attr name="android:layout_marginLeft" />
-        <!--
-              Specifies extra space on the top side of this view.
-              This space is outside this view's bounds.
-        -->
-        <attr name="android:layout_marginTop" />
-        <!--
-              Specifies extra space on the right side of this view.
-              This space is outside this view's bounds.
-        -->
-        <attr name="android:layout_marginRight" />
-        <!--
-              Specifies extra space on the bottom side of this view.
-              This space is outside this view's bounds.
-        -->
-        <attr name="android:layout_marginBottom" />
-
-        <!-- END MarginLayout layoutparams -->
-
-        <!--
-        The row boundary delimiting the top of the group of cells
-        occupied by this view.
-        -->
-        <attr name="layout_row" format="integer" />
-        <!--
-        The row span: the difference between the bottom and top
-        boundaries delimiting the group of cells occupied by this view.
-        The default is one.
-        See {@link android.widget.GridLayout.Spec}.
-        -->
-        <attr name="layout_rowSpan" format="integer" min="1" />
-        <!--
-        The column boundary delimiting the left of the group of cells
-        occupied by this view.
-        -->
-        <attr name="layout_column" format="integer" />
-        <!--
-        The column span: the difference between the right and left
-        boundaries delimiting the group of cells occupied by this view.
-        The default is one.
-        See {@link android.widget.GridLayout.Spec}.
-        -->
-        <attr name="layout_columnSpan" format="integer" min="1" />
-        <!--
-        Gravity specifies how a component should be placed in its group of cells.
-        The default is LEFT | BASELINE.
-        See {@link android.widget.GridLayout.LayoutParams#setGravity(int)}.
-        -->
-        <attr name="layout_gravity">
-
-            <!-- Push object to the top of its container, not changing its size. -->
-            <flag name="top" value="0x30" />
-            <!-- Push object to the bottom of its container, not changing its size. -->
-            <flag name="bottom" value="0x50" />
-            <!-- Push object to the left of its container, not changing its size. -->
-            <flag name="left" value="0x03" />
-            <!-- Push object to the right of its container, not changing its size. -->
-            <flag name="right" value="0x05" />
-            <!-- Place object in the vertical center of its container, not changing its size. -->
-            <flag name="center_vertical" value="0x10" />
-            <!-- Grow the vertical size of the object if needed so it completely fills its container. -->
-            <flag name="fill_vertical" value="0x70" />
-            <!-- Place object in the horizontal center of its container, not changing its size. -->
-            <flag name="center_horizontal" value="0x01" />
-            <!-- Grow the horizontal size of the object if needed so it completely fills its container. -->
-            <flag name="fill_horizontal" value="0x07" />
-            <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. -->
-            <flag name="center" value="0x11" />
-            <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. -->
-            <flag name="fill" value="0x77" />
-            <!--
-             Additional option that can be set to have the top and/or bottom edges of
-             the child clipped to its container's bounds.
-             The clip will be based on the vertical gravity: a top gravity will clip the bottom
-             edge, a bottom gravity will clip the top edge, and neither will clip both edges.
-            -->
-            <flag name="clip_vertical" value="0x80" />
-            <!--
-             Additional option that can be set to have the left and/or right edges of
-             the child clipped to its container's bounds.
-             The clip will be based on the horizontal gravity: a left gravity will clip the right
-             edge, a right gravity will clip the left edge, and neither will clip both edges.
-            -->
-            <flag name="clip_horizontal" value="0x08" />
-            <!-- Push object to the beginning of its container, not changing its size. -->
-            <flag name="start" value="0x00800003" />
-            <!-- Push object to the end of its container, not changing its size. -->
-            <flag name="end" value="0x00800005" />
-        </attr>
-    </declare-styleable>
-
-</resources>
\ No newline at end of file
diff --git a/android/3rd_party/gridlayout/res/values/dimens.xml b/android/3rd_party/gridlayout/res/values/dimens.xml
deleted file mode 100644
index 963ecb5486..0000000000
--- a/android/3rd_party/gridlayout/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- The default gap between components in a layout. -->
-    <dimen name="default_gap">16dip</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/android/3rd_party/gridlayout/src/.readme b/android/3rd_party/gridlayout/src/.readme
deleted file mode 100644
index 4bcebad80c..0000000000
--- a/android/3rd_party/gridlayout/src/.readme
+++ /dev/null
@@ -1,2 +0,0 @@
-This hidden file is there to ensure there is an src folder.
-Once we support binary library this will go away.
\ No newline at end of file
diff --git a/android/project.properties b/android/project.properties
index 17ac75c292..889aa4479c 100644
--- a/android/project.properties
+++ b/android/project.properties
@@ -13,4 +13,3 @@ android.library=true
 android.library.reference.1=3rd_party/facebook-android-sdk/facebook
 android.library.reference.2=3rd_party/external_styles
 android.library.reference.3=3rd_party/google-play-services_lib
-android.library.reference.4=3rd_party/gridlayout
diff --git a/android/res/layout/info_box_geo.xml b/android/res/layout/info_box_geo.xml
index fa8ab3a8b9..511fdf411a 100644
--- a/android/res/layout/info_box_geo.xml
+++ b/android/res/layout/info_box_geo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/info_box_geo"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/white_rounded_background"
     android:orientation="vertical"
     android:padding="10dp"
-    app:columnCount="2" >
+     >
 
     <LinearLayout
         android:id="@+id/info_box_geo_container_dist"