Merge "Merge "Fix HInstruction::ReplaceInput(), allow no-op." into nyc-dev am: a86d664b am: 1cf65e5f" into nyc-mr1-dev-plus-aosp