Merge "Fix the size of the NDK .note.android.ident ELF note." am: 5466951c8b am: a9d394d070
am: d24f9f194e

Change-Id: Iebaeab133381ed9b8bc8ca7389d0c590c94528ca