Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: bf6a61c40a am: 8603f92e8f

Change-Id: Iad6d8f1449f6c1f3dcd640500604bbc35b970f5b
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 634308a..c8534df 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
@@ -140,4 +141,4 @@
 endif
 endif
 endif
-endif
\ No newline at end of file
+endif