Revert "More cyrpto failures..."

This reverts commit ebb503ac5ac4785dd650a530762f584b12846e79.

Fixed by https://android-review.googlesource.com/168937

Change-Id: I202f5a6c3789cf84ff100f1f5dc8bc2e7ef8be03
1 file changed