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

Change-Id: I401aa4567e7e8251d4629e265c94709022254f4e