Merge "Assign API level 24 to single-source RS API"