Revert the merge to fix the build

Test: local sailfish checkbuild starts
Change-Id: Iee3d59a744b15770b9f4232ad5aa93ff6ba1f22e
tree: ee203cc6bdbb755ff5c819d801f47021e1109092
  1. common/
  2. WORKSPACE