Update logic for detecting pre-apexd services to check that the ART APEX is mounted. am: cacf04351f
am: 4c063099a2

Change-Id: I1bfe1e77b3d9b2ba7efc1482baa1837191771326