Merge "Keymaster should be developed in AOSP"