resolved conflicts for merge of fcdf653a to klp-dev-plus-aosp

Change-Id: I1d831bbb4649b2ddc89cdfb71e3b76712bc6469e

diff --cc core/binary.mk
Simple merge

diff --cc core/clear_vars.mk
index f88d355,9b8bf40..d811a98
--- 1/core/clear_vars.mk
--- 2/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@@ -139,7 -137,7 +139,8 @@@ LOCAL_ADDITIONAL_CERTIFICATES:
  LOCAL_PREBUILT_MODULE_FILE:=
  LOCAL_POST_INSTALL_CMD:=
  LOCAL_DIST_BUNDLED_BINARIES:=
 +LOCAL_HAL_STATIC_LIBRARIES:=
+ LOCAL_NO_SYNTAX_CHECK:=
  
  # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
  # iterate over thousands of entries every time.

diff --cc core/config.mk
Simple merge