feature/android updated (0d363aded1e -> 138d500b602)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  0d363aded1e Fix cross-compilation of C++ code with old NDK versions
       new  0e995d06a8d Improve support for building Android C++ dependencies
      adds  7f740b87d8d Remove ineffective uses of condition-case
      adds  a33d3ae98aa Revert "Revert "Don't disable eldoc when doing edebug""
      adds  dff9657c6c0 Redirect eldoc messages to the mode-line when in 
edebug-mode
      adds  682fb19dc32 * lisp/icomplete.el (icomplete-in-buffer): Make into a 
defcustom.
       new  138d500b602 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 configure.ac                                |   3 +
 cross/ndk-build/Makefile.in                 |   1 +
 cross/ndk-build/ndk-build-shared-library.mk |   4 +-
 cross/ndk-build/ndk-build-static-library.mk |   4 +-
 java/INSTALL                                |  18 +++
 lisp/emacs-lisp/eldoc.el                    |  16 +--
 lisp/gnus/message.el                        |   7 +-
 lisp/icomplete.el                           |   5 +-
 lisp/progmodes/cc-engine.el                 |   2 +-
 lisp/progmodes/ruby-mode.el                 | 173 ++++++++++++++--------------
 m4/ndk-build.m4                             |  94 ++++++++++++++-
 11 files changed, 216 insertions(+), 111 deletions(-)