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

Change-Id: I4c2831e55344007235a652e896f7409e2fbc9a7b