am: 1b9a930b * commit '1b9a930b': Fix build breakage caused by redefining attrs Change-Id: Iae28ff991e2dc154db009f75da45f7aa25ada5d2