Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ic09a0592a7ecfd10c916732ca119e2f9e009754d
diff --git a/METADATA b/METADATA
index b16ca91..1aa20de 100644
--- a/METADATA
+++ b/METADATA
@@ -13,6 +13,4 @@
   }
   version: "333ee3023f49a605e886e77c6e8c49bf655c81fb"
   last_upgrade_date { year: 2017 month: 11 day: 15 }
-
-  local_modifications: "Android.mk is created on basis of Makefile.  Some tests are disabled to prevent clang crash on buildbots."
 }