am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."

* commit 'd284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
  Don't set LOCAL_MODULE_PATH for native tests.