This fixes VP10/ActiveMapRefreshTest.Test/*.

Bring commits 575e81f7 and 3d6b8a66 to aom/vp10. These changes predate
the creation of the active map cyclic refresh test.

Change-Id: I3559b6933ffa5649926a4b214e45ed0fae523a25