Merge "Fix the size of the NDK .note.android.ident ELF note."