tree b2ee4bb8f16216a33fd4eae2acaf7a2edd6a5f8f
parent 900afe69b3b37fccccda912fccff6859b88de976
parent 3720181581cc402bbaf4fb5be24ccbf9cd2fc19b
author Elliott Hughes <enh@google.com> 1509550820 +0000
committer android-build-merger <android-build-merger@google.com> 1509550820 +0000

Merge "bionic now has ElfXX_Chdr..." am: 0cb208dc6f am: ce252a75e4
am: 3720181581

Change-Id: I75919b372db6f62ea474c51f11bd544c5bc78c5f