am: a90d80c9 * commit 'a90d80c9': Maybe fix mac build Change-Id: I7aecfa023a1b17c80bb044fd5170168c62847680