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

Change-Id: Id337cdf00f067dee8c8829275e65ca3f02bcee2b