Merge "Don't symlink native library paths for old apps" into gingerbread