Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev