Merge "Cleaning up AbsListView, fixing annotations and updating API calls."