Merge "Define some symlinks for workaround solutions" am: 70e66b45ce

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

Change-Id: I633e0a3c6c87a644795dc0d053cf6c866c8684a0