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

Change-Id: I2670658de32a07bc47917f6b0bb340fc67c8937e