Merge "Give x permission on apex data directories." am: d6289bdf13 am: f29bb3a0ce

Change-Id: I5a9ac45b72e1e84f859d497d08a7e862b8fb3b13