tree 482d3d6644a743b44c3fc79c95e2b6b5e30e6ab2
parent 97c644e689be3b7b3b7898513a38ead399d2285a
parent 203f0a3eec8c630c5183fb9984d66339c1ea3c31
author Chih-Hung Hsieh <chh@google.com> 1453745555 -0800
committer Chih-Hung Hsieh <chh@google.com> 1453749911 -0800

Merge upstream 0.165 SHA '203f0a3'

* git merge 203f0a3
* See all upstream changes since the previous merge
  in branch aosp/upstream-master:
    git diff 9d1e236..203f0a3
* Android relevant upstream changes:
  * Version number changed from 0.164 to 0.165
  * libelf now depends on zlib
* Changed version number in generated files:
    version.h, config.h
* No change to generated files:
    libdw/known-dwarf.h
* Updated libelf/Android.mk:
  * added new source files:
     gelf_getchdr.c elf{32,64}_getchdr.c elf_compress.c
  * added LOCAL_STATIC_LIBRARIES := libz

Change-Id: Ieb306d84ffcaf680ad6e74da28fcc8efbf00592a