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

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

Change-Id: Ia8080989c3f00bacd013cbe5b5d27ce69e29193d