Add new mobile caches, remove old/nonexistant

Change-Id: I3dfab7906ff157b7b53442c6f638efe8579b6709