Update Build Functions from SM

* This should align things more with Google but still with that Lovin' SM goodness

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>