Merge "Teach API lint about package layering!" into lmp-dev