Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp * commit '9430f9d37ec169ce0654bc8950adb66ac974b761': KeyStore: Update the parameters of generating master keys.
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp * commit '9430f9d37ec169ce0654bc8950adb66ac974b761': KeyStore: Update the parameters of generating master keys.