Underp dexroot on cache

Change-Id: I21e97bfd7888e50c5dadf9fabc859ef9b566cf15
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_native into cm-10.2