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

Change-Id: I33ef6436995e011407c861b3dd1bc041274349a5