resolve merge conflicts of 307435f to nyc-dev-plus-aosp

Change-Id: I4b46d9d5a9e7e8fa4fc1d65c316dc7569c96a10a
diff --git a/Android.mk b/Android.mk
index 9d98083..8653519 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#disable build in PDK
+ifneq ($(TARGET_BUILD_PDK),true)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -139,3 +142,5 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/bmd
 LOCAL_SRC_FILES := Embedded/common/data/APIEm/Modules/RFFstd_501.bmd
 include $(BUILD_PREBUILT)
+
+endif #TARGET_BUILD_PDK