Merge "Use apexd to set up chroot apex dir" into sc-dev