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