am: fa020a80 * commit 'fa020a80': Fix build breakage caused by redefining attrs Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6