Merge "Add missing input flags to aidl and add missing definitions" into main