Merge "Revert "Define some symlinks for workaround solutions"" am: b1e828448a am: 36f412b2bc

Original change: https://android-review.googlesource.com/c/platform/development/+/1647008

Change-Id: Ibf7f3e8a60b650bc077f9326729aa3bc927b4503