Merge "DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.." into gingerbread