am 24c1f31c: Merge "Do not check for .so in /system in native mode"

* commit '24c1f31c6f03ffffdb08ee2c1c309edbc15b035f':
  Do not check for .so in /system in native mode