Merge "Swap fill_parent with match_parent in best practices doc."