Merge "Treat non-integer target SDK as version 10000" into rvc-dev