Merge "Update lint rules for graphics/text package layering"