am 47d89c73: Merge "Fix braino in new build targets."

* commit '47d89c7376090a3a4b8eb114e2c861afe27d01d0':
  Fix braino in new build targets.