Merge "Fix RecyclerView.LayoutManager javadoc references" into nyc-dev