Merge changes Ie6777e2b,Iaed834be

* changes:
  Fix for default library path "/vendor/lib"
  Fix bionic-unit-tests