sync trivial label changes from chromiumos These don't really affect any other project, so move them here so we can drop the chromiumos/ specific settings. Change-Id: I06e39195dd3dfa9c3b2202f0350c25aef2e0586f