Merge "Use CONFIG_CTRL_IFACE_AIDL instead of ANDROID"