assertEquals is deprecated, use assertEqual instead

Change-Id: Ie67c4c84eb74d7ed27b3c6c253239aaa1aff4862
Merge "assertEquals is deprecated, use assertEqual instead"