Merge "Add back arc4random_stir for 32-bit android-L"