Merge "Limit the compat symlinks to ART binaries." am: 50e408db2d
am: ac2e66091a

Change-Id: I70f1e7a33d53d0fefd58af1dccb33e960c605e29