Underp dexroot on cache

Change-Id: I21e97bfd7888e50c5dadf9fabc859ef9b566cf15
Merge remote-tracking branch 'CyanogenMod/cm-10.2' into cm-10.2