Fix PBKDF2WithHmacSHA1 to use high bits

Bug: 8312059
Bug: https://code.google.com/p/android/issues/detail?id=40578

Cherry picked from commit a2ab0a62bc1ca3978e3ab3a3c1f8288f29a30e7e

Change-Id: I749380979671709d63cc87f798b77ed5d8eaef6e
5 files changed