Merge "Nativeloader: Add minimal effort for host library path" am: 01ccde321f
am: f9138787d3

Change-Id: I069435892c78f45138dd72a54be94f0316ac4cb4