Merge "Updating version check to use SDK_INT" into ub-launcher3-calgary am: 6fbdc09e1c
am: a968be35be

Change-Id: I1007961ef8e1f48062edba931c38379615066328