am fcd73824: am dd251cab: Merge "Fix build." into jb-dev

* commit 'fcd738240a7d716e21721514202caa5bfb2dcb98':
  Fix build.