Merge "Revert "Revert "Remove obsolete AndroidTestCase"""