Merge "Special case case-insensitivity for Android/{data,obb}" into rvc-dev