Merge "Add source map for binaries from RBE" am: 7f5ba5360a am: 7267f5a92c am: 35e157de5b

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

Change-Id: Id0fde44eb870de04d70492e9e6c158d17cc5d2a3