Merge "Restore BouncyCastle's RC4 implementation" into dalvik-dev