Merge remote-tracking branch 'aosp/upstream-master' into elfutils

Test: m checkbuild
Change-Id: Id45a47b9a15d272f3e83b0c958532a5c5f0f29d9