Merge "android_memset.c: Use sanitized shifts"