Merge "Fix javadoc for Adapter.getViewTypeCount()"