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

* commit '234985a1273060f00d11241e4d9e107ba900fdb3':
  Fix warning of "overriding commands for target ...boot.oat".