Merge "Fix uses_libs properties for OneMedia." into aosp-main-future