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

Change-Id: I45169b2aedc8d11b08f5aba33f00912630bde2a6