Merge "Fix view tests to account for alternate actionbars" into honeycomb-mr1