Underp dexroot on cache

Change-Id: I21e97bfd7888e50c5dadf9fabc859ef9b566cf15
merge changes from CyanogenMod 10.2 into local branch