Merge "Deprecate fill_parent and introduce match_parent. Bug: #2361749."