Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION"