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

* commit 'ebbc891ae4ca835dea278430e3bad42d4630e2af':
  Fix build.