Merge "Fix javadocs for layout attributes"