am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread

Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.