Merge "Remove redunant aidl api"