encoder: explicitly disable AMP if rectangular modes are disabled

In the mode decision logic, asymmetrical motion prediction is implicitly
disabled when rectangular modes are disabled. This makes the disabling more
explicit, AMP will not appear as enabled in the "encoding tools" log line.
lowres: fixup bad merge/patch re-import