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

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

Change-Id: I1c70b35f8ce140fe4b96a20ee6fcb639f4c6fbe1