Merge "Allow shell to write to /sdcard/Android/data and /sdcard/Android/obb."