Merge "arc4random.h: remove some cruft." am: a06df5faef

Change-Id: Iaa6f7d7be22d3e55d15e81c7ea0b92b6257b7b23