Merge "Add elf note containing ndk version info" am: 89e62091f6
am: 9b94834684

Change-Id: I8906e5db63c3fe1e00574a957e07bdc0ff210544