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

Change-Id: I27b92f59d24af07b2ec8c57b46154dde44a8b1d1