Merge "Revert "Remove obsolete AndroidTestCase""