Merge "Add /data/apex to directories that don't need to be encrypted."