am 633b5ed5: Merge change 8178 into donut

Merge commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5'

* commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5':
  Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script

ndk/build/core/clear-vars.mk

@@ -24,6 +24,7 @@ NDK_LOCAL_VARS := \
   LOCAL_CXXFLAGS \
   LOCAL_CPPFLAGS \
   LOCAL_LDFLAGS \
+  LOCAL_LDLIBS \
   LOCAL_ARFLAGS \
   LOCAL_CPP_EXTENSION \
   LOCAL_STATIC_LIBRARIES \

ndk/docs/CHANGES.TXT

@@ -17,7 +17,8 @@ current version
      LOCAL_LDLIBS := -lz
 
   Actually work correctly, instead of having the linker complaining that it
-  could not find the corresponding libz.so library.
+  could not find the corresponding libz.so library. Also clear LOCAL_LDLIBS
+  in $(CLEAR_VARS) script.
 
 - Generate thumb binaries by default.