am 32881715: Merge "Updating makefile to use the current SDK" into ub-launcher3-burnaby

* commit '3288171507ae38bce261dcf94cfae08392d961c2':
  Updating makefile to use the current SDK