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

Change-Id: Id3a451ca9509789a9e563fc2819e5de2faddcdd1