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

Change-Id: I8e42fc117c757e0e8bc0ec34033f93d77e39eba6