Increases amortization blocks. Improves results a little.
Also adds aom_clear_system_state() calls correctly to avoid
some occasional crash issues.

Change-Id: Ib776ee5ec30c70c1cd4a1fae7e7f23c2acc58ef6