update zip entry cache every time base file is modified
Merge branch 'master' into ice-cream-sandwich