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

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

Change-Id: Iebdb08a987d51ba255176f12b31a19527dd4ee77