assertEquals is deprecated, use assertEqual

Also change to assertTrue/False where assertEqual(True,/False) was
used.

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