Merge "Update common.fmq aidl_interface with versions_with_info"