Underp dexroot on cache

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