Merge "Keep track of protected data dirs in DexManager" into oc-dev