Merge "Avoid crash when ANDROID_DATA is not writeable."