Merge "Keymaster should be developed on AOSP"