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

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

Change-Id: If58c16593b1669f11ad2a3fb95badc7609b72e70