Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1