Fix the tests.

Most of the failures were caused by proguard being more aggressive by the look
of it. Added some @VisibleForTesting's fixes those.

Also some failured caused by the move to a 2-pane UI breaking assumptions made
in the tests.

Dependand on change: Icb5c0302aa320575085b0258b478933cb10e9c6b

Change-Id: I3e0d53c3fb299d9b9b41f51e1b34b648a8e63d86
6 files changed