Merge "Migrate dependency from base to modules-utils" into stage-aosp-master