Merge "Revert "Avoid crash when ANDROID_DATA is not writeable.""
am: 1c4f93341d

Change-Id: I9b9a75580abd6023bcc3ad4a461460731822c897