am ddfe5d57: Merge "Fix build." into mnc-dev

* commit 'ddfe5d573ec002843324694c2bed723acf1d293e':
  Fix build.