am b31b4cc0: am 13e929c1: Merge "Don\'t set LOCAL_MODULE_PATH for native test."

* commit 'b31b4cc07debb0a987f7c20d18b6cef059932d3e':
  Don't set LOCAL_MODULE_PATH for native test.