am: bd58a384 * commit 'bd58a384': Maybe fix mac build Change-Id: I4d3c1a772157003f5667775efaea3eae190b6770