Merge "Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d am: 98568f57" into oc-mr1-dev-plus-aosp am: e8626dee"