Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art." am: 4e4b3ac9c5
am: f1d3b8da7e

Change-Id: Icb292b7c14f77c80adc151f5cf1bfc441c659442