Merge "Add //packages/modules/common/build" into main