Fix proguard flags

Removed problematic *ForTest and use NeededForTesting instead.

Change-Id: I61517b6ea30da2461f541ceca19f04f24f8624da
8 files changed