Restore PBE Cipher wrap and unwrap support from upstream

Bug: https://code.google.com/p/android/issues/detail?id=41405
Change-Id: I9bf90613c510f753032110724b074d31ae76a1fb
6 files changed