+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.
This reverts commit 89099548f8.
Bug: 137859686
Change-Id: I7bb2a7e4b2dca3696761e7c030f3380b9226b676
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59