Merge "main.mk: Set dalvik.vm.stack-trace-dir"