Merge "Update stale comment for dalvik.vm.stack-trace-file."
am: 5b50433f19

Change-Id: I52e974e8fba0d4a7d546ed30cf0099b60f589afc