Merge "Change ownership of apex data directories to root."
am: 931257683d

Change-Id: Icba57e2e3c5fc813b1d2f66da0e1551c06394b5c