Merge commit '6157e899e21792885766c018a6c579122eea502d'

Merge commit corresponding to SOF v0.5 release.

BUG=b:112528390, b:110025789
TEST=cros deploy <BOARD> sof-topoogy and verify that the DSP
     boots on an octopus board.

Change-Id: I7c2837fc2563278f5e1ced999482b07f63eb7726