Fixing layout of several test suites for round screens. DO NOT MERGE am: 81ce8a8e80  -s ours
am: e80ccf0a7b

Change-Id: I5caee8b7b1c09b7c3490395954cf02165c85c145