Underp dexroot on cache

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

Conflicts:
	cmds/installd/Android.mk

Change-Id: Id349527834305029ba92e00c2d3a23fda1bb3a28
Revert "Revert "installd: Skip dexroot-on-cache for user builds""

This reverts commit a4879a238a9d24d50dd90f1ab380966761396cc4.

Conflicts:

	cmds/installd/Android.mk

Change-Id: I35f7dec6918c7c800b026abe65bb8b9837767621