Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: 7adb6a1c58 am: 6792a33c0c am: 5ccbe1ef42

Change-Id: I254e3192e46b9f339d1b7193b85afb361e2789dd