Use assertEqual() rather than assertEquals()

assertEquals() is deprecated:

  http://docs.python.org/2/library/unittest.html#deprecated-aliases

Change-Id: I9e74cb0f989854804f7bf7e89cb022925b47bf16
Merge "Use assertEqual() rather than assertEquals()"