DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ifbae4d323a754181851a4eaa0313dcd45c8bfa19
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 7af3b53..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2014 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.
-
-LOCAL_PATH:= $(call my-dir)
-# Don't include in unbundled build.
-ifeq ($(TARGET_BUILD_APPS),)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif