Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10 am: 109a82d7e3
am: 77274269ba

Change-Id: Id450c7da8d22390c0e7506ed9058bdbf261d3ef4