Merge "Keystore should be developed in AOSP."