am 7af216ff: Merge "Fixing build." into ub-launcher3-burnaby

* commit '7af216ff04b7f0c3852119b476d8f692edfcaaa7':
  Fixing build.