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

Change-Id: Id245a6ad8ebe0317cfb30393a790745edbf70f6b