am d60ab565: am 19f9c1c2: Fix nothing-to-do build.

Merge commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088'

* commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088':
  Fix nothing-to-do build.