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

Change-Id: I1f295e9285f35c5021a343c049e503592d261e3e