Revert "Update parallel_emerge to honor EMERGE_DEFAULT_OPTS."
Revert "Update parallel_emerge to honor EMERGE_DEFAULT_OPTS."

This reverts commit 93777d198d540339e555b64afdb6161d42b9a2d2.

BUG=chromium-os:15822
TEST=none

Change-Id: I19b148c66be0c2b88e929a163f3a0d295b88b206
Reviewed-on: http://gerrit.chromium.org/gerrit/1674
Reviewed-by: David James <f231dc574bbeb62604660cbc162d1b8642a0a3af@chromium.org>
Tested-by: David James <f231dc574bbeb62604660cbc162d1b8642a0a3af@chromium.org>

coreos/chromite,bpsinc-native/src_third_party_chromite,coreos/chromite,bpsinc-native/src_third_party_chromite,coreos/chromite,chadversary/chromiumos.chromite,zhang0137/chromite,bpsinc-native/src_third_party_chromite,chadversary/chromiumos.chromite,zhang0137/chromite,zhang0137/chromite