Merge "Don't double-wrap with gomacc"
am: b7a12806b1

Change-Id: If5e9b3a9dabfd3db9b16fe37e5ed0ffad956cfbb