Merge "Read .note.gnu.build-id."
am: a5913bdd07

Change-Id: I7bc9d015f0406429cf1694074bb6b6318059d96c