Snap for 4533842 from 51d7a291337b107022e1dcc373167c268fc6c3ec to pi-release

Change-Id: Icce99277cd103bd2eab20c958dbd05cad73f33cc
diff --git a/com/android/databinding/baseLibrary/maven-metadata.xml.orig b/com/android/databinding/baseLibrary/maven-metadata.xml.orig
deleted file mode 100644
index b0a83c0..0000000
--- a/com/android/databinding/baseLibrary/maven-metadata.xml.orig
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <versioning>
-<<<<<<< HEAD
-    <release>2.3.3</release>
-||||||| merged common ancestors
-    <release>2.4.0-alpha3</release>
-=======
-    <release>3.0.0-alpha4</release>
->>>>>>> Add Android Gradle Plugin 3.0.0-alpha4
-    <versions>
-      <version>1.0-rc5</version>
-      <version>1.0</version>
-      <version>1.1</version>
-      <version>2.0.0-alpha9</version>
-      <version>2.0.0-beta2</version>
-      <version>2.0.0-beta5</version>
-      <version>2.0.0-beta6</version>
-      <version>2.0.0-beta7</version>
-      <version>2.1.0-alpha3</version>
-      <version>2.1.0-alpha4</version>
-      <version>2.0.0-rc3</version>
-      <version>2.0.0</version>
-      <version>2.1.0-beta1</version>
-      <version>2.1.0-beta3</version>
-      <version>2.1.0-rc1</version>
-      <version>2.1.0</version>
-      <version>2.2.0-alpha1</version>
-      <version>2.1.2</version>
-      <version>2.2.0-alpha3</version>
-      <version>2.2.0-alpha4</version>
-      <version>2.2.0-alpha6</version>
-      <version>2.2.0-alpha7</version>
-      <version>2.2.0-beta1</version>
-      <version>2.1.3</version>
-      <version>2.2.0-beta2</version>
-      <version>2.2.0-beta3</version>
-      <version>2.2.0-rc1</version>
-      <version>2.2.0-rc2</version>
-      <version>2.2.0</version>
-      <version>2.2.1</version>
-      <version>2.3.0-alpha1</version>
-      <version>2.2.3</version>
-      <version>2.3.0-beta1</version>
-      <version>2.3.0-beta2</version>
-      <version>2.3.0-beta3</version>
-      <version>2.3.0-beta4</version>
-      <version>2.5.0-alpha-preview-01</version>
-      <version>2.3.0</version>
-      <version>2.4.0-alpha1</version>
-      <version>2.4.0-alpha3</version>
-<<<<<<< HEAD
-      <version>2.3.1</version>
-      <version>2.4.0-alpha5</version>
-      <version>2.4.0-alpha6</version>
-      <version>2.5.0-alpha-preview-02</version>
-      <version>2.4.0-alpha7</version>
-      <version>2.3.3</version>
-||||||| merged common ancestors
-=======
-      <version>3.0.0-alpha4</version>
->>>>>>> Add Android Gradle Plugin 3.0.0-alpha4
-    </versions>
-<<<<<<< HEAD
-    <lastUpdated>20170608165739</lastUpdated>
-||||||| merged common ancestors
-    <lastUpdated>20170321235025</lastUpdated>
-=======
-    <lastUpdated>20170628165801</lastUpdated>
->>>>>>> Add Android Gradle Plugin 3.0.0-alpha4
-  </versioning>
-</metadata>