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