Merge "Native loader as a separate library" am: beceb6ef53
am: 17f119eade

* commit '17f119eadebc1a9b4d8236ad78df03844ca44044':
  Native loader as a separate library