Merge "Support modules to be installed directly to recovery.img"