Merge "Allow developers to specify a target RS API level for C++"