Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev