Merge "Add Aidl changes to support enable/disable CONFIG_CTRL_IFACE_AIDL flag"