* Patch to fix builds with custom targets on iOS simulator. #16787 * Fix for unused import. * Code review changes applied.