Merge "Switch to toybox stat on macOS too." am: bae0fd454c am: cdc17eef28
am: efb3f61035

Change-Id: Ib33e98bb9b0e9483d7dbedcd6e02b29e1402054a