Use preview_sdk_int for version code checks am: 0c8cdf54db am: 1311f427f5

Change-Id: I4f8ad6400804adb2bbb4db907c7a0bbb2ccf7cbf