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

Change-Id: I2b2431d30526bbeb2b0725c06a25fba667348ca7