Merge "Make AndroidRuntime only start the debugger for zygote forked apps." am: 5cdf28f38b
am: 710b7c6626

Change-Id: I76a047647aaae7b50d62292ba04bd93350ba234c