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

Change-Id: I75aa54df817810571bfab70955918cd4263148e0