Merge "Revert "Disabling som attributes so that dependencies can use compat libraries"" into ub-launcher3-burnaby-polish
am: 81131edc8e

* commit '81131edc8ed9c1d866d98bef3f08bbd9eb4d47fc':
  Revert "Disabling som attributes so that dependencies can use compat libraries"