Merge "consumerir: define the consumerir HIDL interface"