Snap for 4590521 from e2fc29552df217d3dbf3a232c29b22c3fd84eaa7 to pi-release

Change-Id: I078143a9e40a9ecf3fd48c88e4cce6ca52cdd844
diff --git a/build/wpantund.mk b/build/wpantund.mk
index 029ff6c..5a1999b 100644
--- a/build/wpantund.mk
+++ b/build/wpantund.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOWPAN_HAL_ENABLED = 1
+LOWPAN_HAL_ENABLED := true
 
 PRODUCT_PACKAGES += \
     wpantund
diff --git a/lowpan_hdlc_adapter/Android.mk b/lowpan_hdlc_adapter/Android.mk
index 8b96da4..bce5b67 100644
--- a/lowpan_hdlc_adapter/Android.mk
+++ b/lowpan_hdlc_adapter/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(LOWPAN_HAL_ENABLED), 1)
+ifeq ($(LOWPAN_HAL_ENABLED),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := lowpan_hdlc_adapter
 LOCAL_MODULE_TAGS := optional