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

Change-Id: I870e09fe4797d31ab4d0ab41c74ec1ead949fce9