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

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

Change-Id: Ibcf9adfe591c66b1401cd17b31830909c01cbf43