Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread