Merge "Add compat symlinks into the Runtime APEX for the ART binaries."
am: 48c6d139b3

Change-Id: I96b382d1005dc3ccad016f194329cb83231144e9