Merge "Add layout_marginHorizontal|Vertical attributes"