Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585

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

Change-Id: I474d81c59666793d3389c22fe9301a32f27af472