Merge "Merge remote-tracking branch 'aosp/upstream-master' into elfutils"
am: 5e2439a0e5

Change-Id: Ie5676b66e7d4b756ea36a6075ff900cd14f0e8df