am 28f4188b: Merge "Removing more code with API 21 dependencies." into ub-launcher3-burnaby

* commit '28f4188bacad6a1e72cbed04ff3af1597d234cad':
  Removing more code with API 21 dependencies.