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

* commit '2d465919ab4945536f1b55cbc4a3ef80de39daf5':
  Fix braino in new build targets.