Merge "Generate IKeystoreService using aidl"