Merge "Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS." into main