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

Change-Id: I7931d486bef8818a3705de12d8ffe2f1dca0d1d4