Mako updates:  More bionic optimizations and build torch

Change-Id: I50473e9dde1a7539a28f200352a11f3f16262af6