FDO: bring linking inline with AOSP subission