Merge "Revert "Add /odm/lib to shared lib search path""
am: cb025e55f7

* commit 'cb025e55f707216eb36b07f6fc36dcf604a45c07':
  Revert "Add /odm/lib to shared lib search path"