Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."" am: b3cef78e8d
am: e49f4ef9fa

Change-Id: Iea3ba9377f0a4cc5a6056e6a6116206d95a19d66