Merge "NativeLibraryHelper: Minor fixes"
am: c1536f0d10

Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797