Merge "enable recovery img build for PDK"