Merge "Allow static/shared modules to be disabled per-arch"