am 69974972: resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp

* commit '69974972bec274bc6da6749707fe0c8ce2bc0c0d':
  LibNativeBridge: Add early init & env setup