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

Change-Id: Id780d7d12d7432984bf7cfaa3b928f0a0163ebb1