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

* commit 'beceb6ef53b736879a962992c43fa318e3ea2999':
  Native loader as a separate library