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

Change-Id: I362df209d24a9e2602da1b8cf72e4ea63b5e7f60