am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"

* commit 'fb7bcce68a2a1567410cfa0c800fe8568e037641':
  Add back arc4random_stir for 32-bit android-L