Merge "Add @attr links to TextInputLayout" into mnc-ub-dev