Merge pull request #8949 from JosJuice/android-cache Android: Use system cache directory as cache directory