Merge "Prevent ActivityTestCase from erasing constants." into honeycomb