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

Change-Id: I3b4c79c0efaf68207157b6f6a8d095efb178feb1