Merge "Add VERSION_CODES constant for S"