Merge "Remove obsolete AndroidTestCase"