Merge "Move build-image-kernel-modules out of recovery macro"