Merge 51db0b5ed97164bb9ae8935b985d07159968ff0d on remote branch

Change-Id: Iab1d3cdb49ef30439739ead167123247dfbf02d6
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index a4d6d98..4c8b3c9 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -18,6 +18,7 @@
 BOARD_IPAv3_LIST += sdm710
 BOARD_IPAv3_LIST += msmnile
 BOARD_IPAv3_LIST += kona
+BOARD_IPAv3_LIST += lahaina
 BOARD_IPAv3_LIST += $(MSMSTEPPE)
 BOARD_IPAv3_LIST += $(TRINKET)
 BOARD_IPAv3_LIST += lito
@@ -139,4 +140,4 @@
 endif
 endif
 endif
-endif
\ No newline at end of file
+endif