Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art."