Merge data.lnx.2.0-rel on remote branch

Change-Id: I8eeb824abc058bb4615a59d048b90c344ddb80de
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 9a4d659..2e3e96f 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -31,7 +31,7 @@
 LOCAL_CFLAGS += -DDEBUG
 endif
 
-ifeq ($(TARGET_BOARD_PLATFORM),msmcobalt)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8998)
 LOCAL_CFLAGS += -DFEATURE_IPA_V3
 endif