Merge "Avoid absolute path loading .so after M"
am: 87a138f44b

* commit '87a138f44b9ca46d182145cbcdef15a179ed823d':
  Avoid absolute path loading .so after M