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

Change-Id: I07d87b14a1ef22c035ff8074a1649ead32a4b728