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

Change-Id: I82652e5bd3c00f8f9dfd7cf25d94502f43431832