Underp dexroot on cache

Change-Id: I21e97bfd7888e50c5dadf9fabc859ef9b566cf15
Merge branch 'jb-mr2' of https://github.com/AICP/frameworks_native into jb-mr2