Merge "Increase the upper limit of slang target API to 31."