Merge "Add elf note containing ndk version info"