Merge "Add static dependency between key_store_service and IKeyStoreService.aidl"